← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/module/option_context.cc

Merge Joe, plus I updated the tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/module/option_context.cc
79
79
/*
80
80
 * Private methods.
81
81
 */
82
 
std::string option_context::prepend_name(std::string in_module_name,
 
82
std::string option_context::prepend_name(std::string module_name,
83
83
                                         const char *name_in)
84
84
{
85
 
  in_module_name.push_back('.');
86
 
  std::transform(in_module_name.begin(), in_module_name.end(),
87
 
                 in_module_name.begin(), SwapUnderscores());
88
 
  std::transform(in_module_name.begin(), in_module_name.end(),
89
 
                 in_module_name.begin(), ::tolower);
90
 
  in_module_name.append(name_in);
91
 
  return in_module_name;
 
85
  module_name.push_back('.');
 
86
  std::transform(module_name.begin(), module_name.end(),
 
87
                 module_name.begin(), SwapUnderscores());
 
88
  module_name.append(name_in);
 
89
  return module_name;
92
90
}
93
91
 
94
92