← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/definition/cache.cc

  • Committer: Olaf van der Spek
  • Date: 2011-02-28 14:09:50 UTC
  • mfrom: (2207 bootstrap)
  • mto: (2209.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 2210.
  • Revision ID: olafvdspek@gmail.com-20110228140950-2nu0hyzhuww3wssx
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/definition/cache.cc
37
37
table::instance::Shared::shared_ptr Cache::find(const identifier::Table::Key &key)
38
38
{
39
39
  boost::mutex::scoped_lock scopedLock(_mutex);
40
 
  if (Map::mapped_type* i= find_ptr(cache, key))
41
 
    return *i;
 
40
  if (Map::mapped_type* ptr= find_ptr(cache, key))
 
41
    return *ptr;
42
42
  return table::instance::Shared::shared_ptr();
43
43
}
44
44