← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/generator/table.h

  • Committer: Brian Aker
  • Date: 2010-11-10 20:56:34 UTC
  • mfrom: (1921.1.2 trunk)
  • Revision ID: brian@tangent.org-20101110205634-u5rt2i4ibpyj20wh
Rollup patch around using shared_ptr with Table messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/generator/table.h
30
30
class Table
31
31
{
32
32
  Session &session;
33
 
  message::Table table;
 
33
  message::TablePtr table;
34
34
 
35
35
  TableIdentifiers table_names;
36
36
  TableIdentifiers::const_iterator table_iterator;
39
39
 
40
40
  Table(Session &arg, const SchemaIdentifier &schema_identifier);
41
41
 
42
 
  operator const drizzled::message::Table*()
 
42
  operator const drizzled::message::TablePtr()
43
43
  {
44
44
    while (table_iterator != table_names.end())
45
45
    {
46
 
      table.Clear();
 
46
      table->Clear();
47
47
      bool is_table_parsed= plugin::StorageEngine::getTableDefinition(session, *table_iterator, table);
48
48
      table_iterator++;
49
49
 
50
50
      if (is_table_parsed)
51
 
        return &table;
 
51
        return table;
52
52
    }
53
53
 
54
 
    return NULL;
 
54
    return message::TablePtr();
55
55
  }
56
56
 
57
57
  operator const drizzled::TableIdentifier*()