← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/user_locks/locks.cc

  • Committer: Olaf van der Spek
  • Date: 2011-02-24 13:19:47 UTC
  • mto: (2209.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 2207.
  • Revision ID: olafvdspek@gmail.com-20110224131947-0fra5adn3kixp6v1
Use "iter->" instead of "(*iter)."

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/user_locks/locks.cc
35
35
  LockMap::iterator iter;
36
36
  while ((iter= lock_map.find(arg)) != lock_map.end())
37
37
  {
38
 
    if (id_arg == (*iter).second->id)
 
38
    if (id_arg == iter->second->id)
39
39
    {
40
40
      // We own the lock, so we just exit.
41
41
      return true;
137
137
  if ( iter == lock_map.end())
138
138
    return false;
139
139
 
140
 
  id_arg= (*iter).second->id;
 
140
  id_arg= iter->second->id;
141
141
 
142
142
  return true;
143
143
}
167
167
  if ( iter == lock_map.end())
168
168
    return locks::NOT_FOUND;
169
169
 
170
 
  if ((*iter).second->id == id_arg)
 
170
  if (iter->second->id == id_arg)
171
171
  {
172
172
    elements= lock_map.erase(arg);
173
173
    assert(elements); // If we can't find what we just found, then we are broken