← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/registry_dictionary/plugins.h

  • Committer: Eric Day
  • Date: 2010-03-25 19:28:37 UTC
  • mfrom: (1405 staging)
  • mto: This revision was merged to the branch mainline in revision 1409.
  • Revision ID: eday@oddments.org-20100325192837-4exmacbrywjovsqp
Merged trunk, rsolved conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/registry_dictionary/plugins.h
29
29
 
30
30
  class Generator : public drizzled::plugin::TableFunction::Generator 
31
31
  {
32
 
    std::map<std::string, const drizzled::plugin::Plugin *>::const_iterator it;
33
 
    std::map<std::string, const drizzled::plugin::Plugin *>::const_iterator end;
 
32
    std::map<std::string, drizzled::plugin::Plugin *>::const_iterator it;
 
33
    std::map<std::string, drizzled::plugin::Plugin *>::const_iterator end;
34
34
 
35
35
  public:
36
36
    Generator(drizzled::Field **arg);