← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/identifier/catalog.h

  • Committer: Olaf van der Spek
  • Date: 2011-08-03 10:04:55 UTC
  • mfrom: (2382 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2384.
  • Revision ID: olafvdspek@gmail.com-20110803100455-2oqzyi77v4gykhy0
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/identifier/catalog.h
24
24
#include <drizzled/definitions.h>
25
25
#include <string.h>
26
26
 
27
 
#include <assert.h>
 
27
#include <cassert>
28
28
 
29
29
#include <ostream>
30
30
#include <vector>
31
31
#include <algorithm>
32
32
#include <functional>
33
 
#include <iostream>
 
33
#include <iosfwd>
34
34
 
35
35
#include <boost/algorithm/string.hpp>
36
36
 
41
41
{
42
42
public:
43
43
  Catalog(const std::string &name_arg);
44
 
  Catalog(const drizzled::LEX_STRING &name_arg);
 
44
  Catalog(const drizzled::lex_string_t &name_arg);
45
45
  bool isValid() const;
46
46
  bool compare(const std::string &arg) const;
47
47