← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/user_locks/locks.h

  • Committer: Brian Aker
  • Date: 2010-11-23 09:35:51 UTC
  • mfrom: (1933.2.13 catalogs)
  • Revision ID: brian@tangent.org-20101123093551-l5m7zhz3m5c4wmlk
Merge in changes for barriers (update for kill, etc).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/user_locks/locks.h
24
24
#include <boost/logic/tribool.hpp>
25
25
#include <boost/unordered/unordered_set.hpp>
26
26
 
 
27
#include "plugin/user_locks/lock.h"
 
28
 
27
29
#include <string>
28
30
 
29
31
#include "drizzled/session.h"
40
42
class Locks
41
43
{
42
44
public:
43
 
  struct lock_st {
44
 
    drizzled::session_id_t id;
45
 
 
46
 
    lock_st(drizzled::session_id_t id_arg) :
47
 
      id(id_arg)
48
 
    {
49
 
    }
50
 
  };
51
 
 
52
 
  typedef boost::shared_ptr<lock_st> lock_st_ptr;
53
 
 
54
 
  typedef boost::unordered_map<user_locks::Key, lock_st_ptr> LockMap;
 
45
  typedef boost::unordered_map<user_locks::Key, user_locks::Lock::shared_ptr> LockMap;
55
46
 
56
47
  static Locks &getInstance(void)
57
48
  {