← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/identifier/catalog.cc

  • Committer: Mark Atwood
  • Date: 2011-10-06 04:38:39 UTC
  • mfrom: (2426.3.1 drizzle-docs71)
  • Revision ID: me@mark.atwood.name-20111006043839-qrtu9wtrr04k7ie4
merge lp:~hingo/drizzle/drizzle-new-pandora-pluginini-keys

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/identifier/catalog.cc
41
41
namespace drizzled {
42
42
namespace identifier {
43
43
 
44
 
Catalog::Catalog(const std::string &name_arg) :
45
 
  _name(name_arg)
 
44
Catalog::Catalog(str_ref name_arg) :
 
45
  _name(name_arg.data(), name_arg.size())
46
46
{ 
47
47
  init();
48
48
}
49
49
 
50
 
Catalog::Catalog(const drizzled::lex_string_t &name_arg) :
51
 
  _name(name_arg.str, name_arg.length)
52
 
{
53
 
  init();
54
 
}
55
 
 
56
50
void Catalog::init()
57
51
{ 
58
52
  assert(not _name.empty());