← 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-18 23:49:00 UTC
  • mfrom: (2182.1.4 build)
  • Revision ID: kalebral@gmail.com-20110218234900-7zxzvw9x7e7zwflr
Merge Brian - add safe_delete()
Merge Stewart - 720552: doStartIndexScan return code ignored in optimizer::sum_query() for MIN() optimization 
Merge Olaf - add register keyword
Merge Patrick - 720813: syntax error in dbqp that is breaking it

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/cached_directory.cc
78
78
 
79
79
CachedDirectory::~CachedDirectory()
80
80
{
81
 
  for (Entries::iterator p= entries.begin(); p != entries.end(); ++p)
 
81
  for (Entries::iterator iter= entries.begin(); iter != entries.end(); ++iter)
82
82
  {
83
 
    if (*p)
84
 
      delete *p;
 
83
    delete *iter;
85
84
  }
86
85
  entries.clear();
87
86
}