← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/cached_directory.cc

  • Committer: Lee Bieber
  • Date: 2011-02-28 21:18:08 UTC
  • mfrom: (2197.3.2 change-item-tree)
  • mto: This revision was merged to the branch mainline in revision 2209.
  • Revision ID: kalebral@gmail.com-20110228211808-959z6dmotznfvx64
Merge Olaf - Remove Session::change_item_tree

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/cached_directory.cc
37
37
#include <limits.h>
38
38
 
39
39
#include <drizzled/cached_directory.h>
40
 
#include <drizzled/util/find_ptr.h>
41
40
 
42
41
using namespace std;
43
42
 
134
133
    if (not allowed_exts.empty())
135
134
    {
136
135
      char *ptr= rindex(result->d_name, '.');
137
 
      if (ptr && allowed_exts.count(ptr))
 
136
 
 
137
      if (ptr)
138
138
      {
139
 
        entries.push_back(new Entry(result->d_name));
 
139
        set<string>::iterator it;
 
140
        it= allowed_exts.find(ptr);
 
141
 
 
142
        if (it != allowed_exts.end())
 
143
        {
 
144
          entries.push_back(new Entry(result->d_name));
 
145
        }
140
146
      }
141
147
    }
142
148
    else