← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to plugin/registry_dictionary/modules.cc

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/registry_dictionary/modules.cc
21
21
#include "config.h"
22
22
 
23
23
#include "plugin/registry_dictionary/dictionary.h"
24
 
#include "drizzled/plugin/library.h"
 
24
#include "drizzled/module/library.h"
25
25
 
26
26
using namespace std;
27
27
using namespace drizzled;
50
50
ModulesTool::Generator::Generator(Field **arg) :
51
51
  plugin::TableFunction::Generator(arg)
52
52
{
53
 
  plugin::Registry &registry= plugin::Registry::singleton();
 
53
  module::Registry &registry= module::Registry::singleton();
54
54
  modules= registry.getList(true);
55
55
  it= modules.begin();
56
56
}
61
61
    return false;
62
62
 
63
63
  {
64
 
    plugin::Module *module= *it;
65
 
    const plugin::Manifest &manifest= module->getManifest();
 
64
    module::Module *module= *it;
 
65
    const module::Manifest &manifest= module->getManifest();
66
66
 
67
67
    /* MODULE_NAME */
68
68
    push(module->getName());