← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/module/context.cc

  • Committer: Monty Taylor
  • Date: 2010-06-25 04:55:52 UTC
  • mfrom: (1637.1.4 staging)
  • Revision ID: mordred@inaugust.com-20100625045552-zh9d8e8va6re0eoe
Fixes from Brian to increase strictness/correctness, Toru to remove
current_session from blitzdb, a race condition bugfix from Joe Daly,
and moving of when plugins call program_options from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/module/context.cc
21
21
#include "drizzled/module/context.h"
22
22
#include "drizzled/module/option_map.h"
23
23
#include "drizzled/module/module.h"
 
24
#include "drizzled/drizzled.h"
24
25
 
25
26
namespace drizzled
26
27
{
 
28
 
 
29
extern boost::program_options::variables_map vm;
 
30
 
27
31
namespace module
28
32
{
29
33
 
30
34
module::option_map Context::getOptions()
31
35
{
32
 
  return module::option_map(module->getName(), module->getVariableMap());
 
36
  return module::option_map(module->getName(), getVariablesMap());
33
37
}
34
38
 
35
39
} /* namespace module */