← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/registry.h

  • Committer: Eric Day
  • Date: 2009-10-31 21:53:33 UTC
  • mfrom: (1200 staging)
  • mto: This revision was merged to the branch mainline in revision 1202.
  • Revision ID: eday@oddments.org-20091031215333-j94bjoanwmi68p6f
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/registry.h
20
20
#ifndef DRIZZLED_PLUGIN_REGISTRY_H
21
21
#define DRIZZLED_PLUGIN_REGISTRY_H
22
22
 
23
 
#include "drizzled/registry.h"
 
23
#include "drizzled/name_map.h"
24
24
#include <string>
25
25
#include <vector>
26
26
#include <map>
39
39
{
40
40
private:
41
41
  std::map<std::string, Handle *> handle_map;
42
 
  ::drizzled::Registry<const Plugin *> plugin_registry;
 
42
  NameMap<const Plugin *> plugin_registry;
43
43
 
44
44
  Handle *current_handle;
45
45