← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/plugin.cc

  • Committer: Monty Taylor
  • Date: 2010-02-05 08:11:15 UTC
  • mfrom: (1283 build)
  • mto: (1273.13.43 fix_is)
  • mto: This revision was merged to the branch mainline in revision 1300.
  • Revision ID: mordred@inaugust.com-20100205081115-dr82nvrwv4lvw7sd
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/plugin.cc
18
18
 */
19
19
 
20
20
#include "config.h"
21
 
#include "drizzled/module/module.h"
22
21
#include "drizzled/plugin/plugin.h"
 
22
#include "drizzled/plugin/module.h"
23
23
 
24
24
namespace drizzled
25
25
{
26
26
 
27
 
plugin::Plugin::Plugin(const std::string &name, const std::string &type_name)
28
 
  : _name(name),
29
 
    _is_active(true),
30
 
    _module(NULL),
31
 
    _type_name(type_name)
 
27
plugin::Plugin::Plugin(std::string in_name, std::string in_type_name)
 
28
  : name(in_name),
 
29
    is_active(true),
 
30
    module(NULL),
 
31
    type_name(in_type_name)
32
32
{ }
33
33
 
34
34
const std::string& plugin::Plugin::getModuleName() const
35
35
{
36
 
  return _module->getName();
 
36
  return module->getName();
37
37
}
38
38
 
39
39
} /* namespace drizzled */