← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/cached_directory.h

Merge Joe, plus I updated the tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/cached_directory.h
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
86
86
   * @param[in] File extensions to allow
87
87
   */
88
88
  CachedDirectory(const std::string& in_path, std::set<std::string>& allowed_exts);
89
 
  CachedDirectory(const std::string& in_path, enum CachedDirectory::FILTER filter, bool use_full_path= false);
 
89
  CachedDirectory(const std::string& in_path, enum CachedDirectory::FILTER filter);
90
90
 
91
91
  /**
92
92
   * Destructor.  Cleans up any resources we've taken 
131
131
private:
132
132
  std::string path; ///< Path to the directory
133
133
  int error; ///< Error code stored from various syscalls
134
 
  bool use_full_path;
135
134
  Entries entries; ///< Entries in the directory
136
135
 
137
136
  /**