Changeset 11578 for trunk/FACT++/src/ftmctrl.cc

Timestamp:

07/24/11 21:20:34 (13 years ago)

Author:

tbretz

Message:

Moved some part of the initialization from main to Configure::DoParse

File:

• trunk/FACT++/src/ftmctrl.cc (modified) (1 diff)

trunk/FACT++/src/ftmctrl.cc

@@ -2444 +2444 @@
     SetupConfiguration(conf);
 
-    po::variables_map vm;
-    try
-    {
-        vm = conf.Parse(argc, argv);
-    }
-#if BOOST_VERSION > 104000
-    catch (po::multiple_occurrences &e)
-    {
-        cerr << "Program options invalid due to: " << e.what() << " of '" << e.get_option_name() << "'." << endl;
+    if (!conf.DoParse(argc, argv, PrintHelp))
         return -1;
-    }
-#endif
-    catch (exception& e)
-    {
-        cerr << "Program options invalid due to: " << e.what() << endl;
-        return -1;
-    }
-
-    if (conf.HasVersion() || conf.HasPrint())
-        return -1;
-
-    if (conf.HasHelp())
-    {
-        PrintHelp();
-        return -1;
-    }
 
     //try