← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/subselect.cc

  • 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.cc
37
37
#include <drizzled/check_stack_overrun.h>
38
38
#include <drizzled/item/ref_null_helper.h>
39
39
#include <drizzled/item/direct_ref.h>
 
40
#include <drizzled/join.h>
40
41
 
41
 
using namespace drizzled;
 
42
namespace drizzled
 
43
{
42
44
 
43
45
extern plugin::StorageEngine *myisam_engine;
44
46
 
2352
2354
{
2353
2355
  for (StoredKey **copy= tab->ref.key_copy ; *copy ; copy++)
2354
2356
  {
2355
 
    enum StoredKey::store_key_result store_res;
2356
 
    store_res= (*copy)->copy();
 
2357
    StoredKey::store_key_result store_res= (*copy)->copy();
2357
2358
    tab->ref.key_err= store_res;
2358
2359
 
2359
2360
    /*
3172
3173
           "<the access method for lookups is not yet created>"
3173
3174
         ));
3174
3175
}
 
3176
 
 
3177
} /* namespace drizzled */