← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbxt/src/xt_defs.h

  • Committer: Brian Aker
  • Date: 2010-10-08 20:13:50 UTC
  • mfrom: (1823.1.3 trunk-drizzle)
  • Revision ID: brian@tangent.org-20101008201350-bmjpgakk12zmyw10
Overall merge of Padraig

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/xt_defs.h
892
892
#define MX_CHARSET_INFO                                         struct drizzled::charset_info_st
893
893
#define MX_CONST_CHARSET_INFO                           const struct drizzled::charset_info_st                  
894
894
#define MX_CONST                                                        const
895
 
#define MX_BITMAP                                                       drizzled::MyBitmap
896
 
#define MX_BIT_SIZE()                                           numOfBitsInMap()
897
 
#define MX_BIT_SET(x, y)                                        (x)->setBit(y)
898
 
#define MX_BIT_FAST_TEST_AND_SET(x, y)                          (x)->testAndSet(y)
 
895
#include <boost/dynamic_bitset.hpp>
 
896
#define MX_BITMAP                                                       boost::dynamic_bitset<>
 
897
#define MX_BIT_SIZE()                                           size()
 
898
#define MX_BIT_SET(x, y)                                        (x)->set(y)
 
899
//#define MX_BIT_FAST_TEST_AND_SET(x, y)                (x)->testAndSet(y)
 
900
#define MX_BIT_FAST_TEST_AND_SET(x, y)          (x)->test(y)
899
901
 
900
902
#define my_bool                                                         bool
901
903
//#define int16                                                         int16_t
1013
1015
 
1014
1016
#endif // DRIZZLED
1015
1017
 
1016
 
#define MX_BIT_IS_SUBSET(x, y)                          bitmap_is_subset(x, y)
 
1018
#define MX_BIT_IS_SUBSET(x, y)                          x->is_subset_of(y)
1017
1019
 
1018
1020
#ifndef XT_SCAN_CORE_DEFINED
1019
1021
#define XT_SCAN_CORE_DEFINED