← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/atomics.h

  • Committer: Padraig O'Sullivan
  • Date: 2009-08-07 14:14:58 UTC
  • mfrom: (1112 staging)
  • mto: (1115.3.4 captain)
  • mto: This revision was merged to the branch mainline in revision 1117.
  • Revision ID: osullivan.padraig@gmail.com-20090807141458-qrc3don58s304ore
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/atomics.h
21
21
#ifndef DRIZZLED_ATOMICS_H
22
22
#define DRIZZLED_ATOMICS_H
23
23
 
24
 
#if defined(HAVE_LIBTBB)
25
 
# include <tbb/atomic.h>
26
 
/* We're actually using the TBB interface directly, but we don't want to tie
27
 
 * the code to a specific implementation. So suck the tbb:: stuff into the
28
 
 * drizzled namespace
29
 
 */
30
 
namespace drizzled {
31
 
  using namespace tbb;
32
 
}
33
 
#else
34
 
 
35
24
# if defined(__SUNPRO_CC)
36
25
#  include <drizzled/atomic/sun_studio.h>
37
26
# endif
185
174
#  endif
186
175
 
187
176
}
188
 
# endif /* defined(HAVE_LIBTBB) */
189
177
 
190
178
#endif /* DRIZZLED_ATOMIC_H */