← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/subselect.h

  • Committer: Monty Taylor
  • Date: 2010-02-04 08:14:46 UTC
  • mfrom: (1277.2.1 build) (1280.2.1 build)
  • mto: This revision was merged to the branch mainline in revision 1283.
  • Revision ID: mordred@inaugust.com-20100204081446-ldh9m486va30uap6
Put everything in drizzled into drizzled namespace.
Put internal stuff into drizzled::internal namespace.
Removed some cruft.
Now every symbol that is shipped in a header is in the drizzled namespace
and everything in the server that's not shipped is labeled internal. woot. 
Removed a lot of the extra extern "C" stuff that was in there. Less ugliness for
internal callbacks now for Sun Studio.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/subselect.h
28
28
#include "drizzled/item/field.h"
29
29
#include "drizzled/item/bin_string.h"
30
30
 
 
31
namespace drizzled
 
32
{
 
33
 
31
34
class Select_Lex;
32
35
class Select_Lex_Unit;
33
36
class JOIN;
402
405
};
403
406
 
404
407
 
405
 
class subselect_engine: public drizzled::memory::SqlAlloc
 
408
class subselect_engine: public memory::SqlAlloc
406
409
{
407
410
protected:
408
411
  select_result_interceptor *result; /* results storage class */
418
421
                         INDEXSUBQUERY_ENGINE, HASH_SJ_ENGINE};
419
422
 
420
423
  subselect_engine(Item_subselect *si, select_result_interceptor *res)
421
 
    :session(0)
 
424
    :session(NULL)
422
425
  {
423
426
    result= res;
424
427
    item= si;
704
707
  virtual enum_engine_type engine_type() { return HASH_SJ_ENGINE; }
705
708
};
706
709
 
 
710
} /* namespace drizzled */
 
711
 
707
712
#endif /* DRIZZLED_ITEM_SUBSELECT_H */