← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: lbieber
  • Date: 2010-09-26 21:17:42 UTC
  • mfrom: (1793.3.3 drizzle-bug-646202)
  • mto: This revision was merged to the branch mainline in revision 1796.
  • Revision ID: lbieber@orisndriz08-20100926211742-yy2fu65qjcotmonp
Merge Andrew - fix bug 646202 - Turn off Boost PO option guessing

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
1342
1342
   N_("Base location for config files"))
1343
1343
  ;
1344
1344
 
1345
 
  po::parsed_options parsed= po::command_line_parser(argc, argv).
 
1345
  // Disable allow_guessing
 
1346
  int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
 
1347
 
 
1348
  po::parsed_options parsed= po::command_line_parser(argc, argv).style(style).
1346
1349
    options(long_options).allow_unregistered().extra_parser(parse_size_arg).run();
1347
1350
  unknown_options=
1348
1351
    po::collect_unrecognized(parsed.options, po::include_positional);
1508
1511
  vector<string> final_unknown_options;
1509
1512
  try
1510
1513
  {
 
1514
    // Disable allow_guessing
 
1515
    int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
1511
1516
    po::parsed_options parsed=
1512
 
      po::command_line_parser(unknown_options).
 
1517
      po::command_line_parser(unknown_options).style(style).
1513
1518
      options(plugin_options).extra_parser(parse_size_arg).run();
1514
1519
 
1515
1520
    final_unknown_options=