← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/generator/schema.h

  • Committer: Monty Taylor
  • Date: 2010-11-25 01:53:19 UTC
  • mto: (1953.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1955.
  • Revision ID: mordred@inaugust.com-20101125015319-ia85msn25uemopgc
Re-enabled -Wformat and then cleaned up the carnage.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/generator/schema.h
30
30
class Schema
31
31
{
32
32
  Session &session;
33
 
  message::schema::shared_ptr schema;
 
33
  message::SchemaPtr schema;
34
34
 
35
 
  SchemaIdentifier::vector schema_names;
36
 
  SchemaIdentifier::vector::const_iterator schema_iterator;
 
35
  SchemaIdentifiers schema_names;
 
36
  SchemaIdentifiers::const_iterator schema_iterator;
37
37
 
38
38
public:
39
39
 
40
40
  Schema(Session &arg);
41
41
 
42
 
  operator const drizzled::message::schema::shared_ptr()
 
42
  operator const drizzled::message::SchemaPtr()
43
43
  {
44
44
    while (schema_iterator != schema_names.end())
45
45
    {
51
51
        return schema;
52
52
    }
53
53
 
54
 
    return message::schema::shared_ptr();
 
54
    return message::SchemaPtr();
55
55
  }
56
56
 
57
57
  operator const drizzled::SchemaIdentifier*()