← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/plugin.h

  • Committer: Lee Bieber
  • Date: 2011-01-11 00:32:40 UTC
  • mfrom: (2070.1.3 build)
  • Revision ID: kalebral@gmail.com-20110111003240-6zjgr8iv04xeznfw
Merge Andrew - fix bug #701124: wrong intl text domain
Merge Andrew - fix bug #701137: drizzled --help not translated  
Merge Shrews - fix bug 701056: filtered_replicator not filtering all events
Merge Monty - Changed the plugin_registry to store a pair of plugin_type/plugin_name instead of just plugin_name

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/plugin.h
46
46
  Plugin(const Plugin&);
47
47
  Plugin& operator=(const Plugin &);
48
48
public:
49
 
  typedef std::map<std::string, Plugin *> map;
 
49
  typedef std::pair<const std::string, const std::string> map_key;
 
50
  typedef std::map<const map_key, plugin::Plugin *> map;
50
51
  typedef std::vector<Plugin *> vector;
51
52
 
52
53
  explicit Plugin(const std::string &name, const std::string &type_name);