← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/module/registry.cc

  • Committer: patrick crews
  • Date: 2011-01-30 23:02:12 UTC
  • mto: This revision was merged to the branch mainline in revision 2131.
  • Revision ID: gleebix@gmail.com-20110130230212-nnts892jsc0oiurv
Added initial docs for dbqp.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/module/registry.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include <config.h>
 
20
#include "config.h"
21
21
 
22
22
#include <string>
23
23
#include <vector>
24
24
#include <map>
25
25
 
26
 
#include <drizzled/module/registry.h>
27
 
#include <drizzled/module/library.h>
28
 
#include <drizzled/module/graph.h>
29
 
#include <drizzled/module/vertex_handle.h>
 
26
#include "drizzled/module/registry.h"
 
27
#include "drizzled/module/library.h"
 
28
#include "drizzled/module/graph.h"
 
29
#include "drizzled/module/vertex_handle.h"
30
30
 
31
 
#include <drizzled/plugin.h>
32
 
#include <drizzled/show.h>
33
 
#include <drizzled/cursor.h>
34
 
#include <drizzled/abort_exception.h>
 
31
#include "drizzled/plugin.h"
 
32
#include "drizzled/show.h"
 
33
#include "drizzled/cursor.h"
 
34
#include "drizzled/abort_exception.h"
35
35
 
36
36
#include <boost/bind.hpp>
37
37
 
64
64
    ++plugin_iter;
65
65
  }
66
66
 
67
 
  plugin::Plugin::vector error_plugins;
68
67
  plugin_iter= plugin_registry.begin();
69
68
  while (plugin_iter != plugin_registry.end())
70
69
  {
71
 
    if ((*plugin_iter).second->removeLast())
72
 
    {
73
 
      error_plugins.push_back((*plugin_iter).second);
74
 
    }
75
 
    else
76
 
    {
77
 
      delete (*plugin_iter).second;
78
 
    }
 
70
    delete (*plugin_iter).second;
79
71
    ++plugin_iter;
80
72
  }
81
 
 
82
 
  for (plugin::Plugin::vector::iterator iter= error_plugins.begin();
83
 
       iter != error_plugins.end(); iter++)
84
 
  {
85
 
    delete *iter;
86
 
  }
87
 
 
88
73
  plugin_registry.clear();
89
74
 
90
75
#if 0
187
172
      }
188
173
      if (not found_dep)
189
174
      {
190
 
        errmsg_printf(error::ERROR,
 
175
        errmsg_printf(ERRMSG_LVL_ERROR,
191
176
                      _("Couldn't process plugin module dependencies. "
192
177
                        "%s depends on %s but %s is not to be loaded.\n"),
193
178
                      handle->getName().c_str(),