← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/quick_ror_intersect_select.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/optimizer/quick_ror_intersect_select.cc
28
28
#include <vector>
29
29
 
30
30
using namespace std;
31
 
using namespace drizzled;
 
31
 
 
32
namespace drizzled
 
33
{
32
34
 
33
35
 
34
36
optimizer::QuickRorIntersectSelect::QuickRorIntersectSelect(Session *session_param,
283
285
      used_lengths->append(',');
284
286
    }
285
287
    key_names->append(key_info->name);
286
 
    length= int64_t2str((*it)->max_used_key_length, buf, 10) - buf;
 
288
    length= internal::int64_t2str((*it)->max_used_key_length, buf, 10) - buf;
287
289
    used_lengths->append(buf, length);
288
290
  }
289
291
 
292
294
    KEY *key_info= head->key_info + cpk_quick->index;
293
295
    key_names->append(',');
294
296
    key_names->append(key_info->name);
295
 
    length= int64_t2str(cpk_quick->max_used_key_length, buf, 10) - buf;
 
297
    length= internal::int64_t2str(cpk_quick->max_used_key_length, buf, 10) - buf;
296
298
    used_lengths->append(',');
297
299
    used_lengths->append(buf, length);
298
300
  }
299
301
}
300
302
 
 
303
} /* namespace drizzled */