← Back to branch summary

~dshrews/drizzle/bug746580_elliott

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Monty Taylor
  • Date: 2010-10-02 05:07:25 UTC
  • mto: (1817.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 1818.
  • Revision ID: mordred@inaugust.com-20101002050725-h1b30b0nr3leeoh1
https://launchpad.net/bugs/652652
Embed a modified version of parse_config_file. There are several more bugs
that we'll want to fix in it, and then submit upstream. Eventually we should
be able to remove this- but for now the version on lucid is completely
broken.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
31
31
#include <stdexcept>
32
32
 
33
33
#include <boost/program_options.hpp>
 
34
#include "drizzled/program_options/config_file.h"
34
35
#include <boost/thread/recursive_mutex.hpp>
35
36
#include <boost/thread/mutex.hpp>
36
37
#include <boost/thread/condition_variable.hpp>
139
140
using namespace std;
140
141
namespace fs=boost::filesystem;
141
142
namespace po=boost::program_options;
 
143
namespace dpo=drizzled::program_options;
142
144
 
143
145
 
144
146
namespace drizzled
1135
1137
    ifstream input_defaults_file(file_location.c_str());
1136
1138
    
1137
1139
    po::parsed_options file_parsed=
1138
 
      po::parse_config_file(input_defaults_file, full_options, true);
 
1140
      dpo::parse_config_file(input_defaults_file, full_options, true);
1139
1141
    vector<string> file_unknown= 
1140
1142
      po::collect_unrecognized(file_parsed.options, po::include_positional);
1141
1143