← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_share.h

  • Committer: patrick crews
  • Date: 2010-09-16 14:38:00 UTC
  • mfrom: (1768 staging)
  • mto: (1771.1.1 pcrews)
  • mto: This revision was merged to the branch mainline in revision 1772.
  • Revision ID: gleebix@gmail.com-20100916143800-hyu1tcfnjcowfnpb
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_share.h
29
29
#include <string>
30
30
 
31
31
#include <boost/unordered_map.hpp>
 
32
#include <boost/thread/condition_variable.hpp>
32
33
 
33
34
#include "drizzled/typelib.h"
34
35
#include "drizzled/memory/root.h"
228
229
private:
229
230
  std::vector<TYPELIB> intervals;                       /* pointer to interval info */
230
231
 
231
 
  pthread_mutex_t mutex;                /* For locking the share  */
232
 
  pthread_cond_t cond;                  /* To signal that share is ready */
 
232
  boost::mutex mutex;                /* For locking the share  */
 
233
  boost::condition_variable cond;                       /* To signal that share is ready */
233
234
 
234
235
 
235
236
  void lock()
236
237
  {
237
 
    pthread_mutex_lock(&mutex);
 
238
    mutex.lock();
238
239
  }
239
240
 
240
241
  void unlock()
241
242
  {
242
 
    pthread_mutex_unlock(&mutex);
 
243
    mutex.unlock();
243
244
  }
244
245
public:
245
246