Changeset 10825 for trunk

Timestamp:

05/25/11 16:38:42 (13 years ago)

Author:

tbretz

Message:

Unified main() with the other programs

File:

• trunk/FACT++/src/dataLogger.cc (modified) (2 diffs)

trunk/FACT++/src/dataLogger.cc

@@ -39 +39 @@
  */
  //****************************************************************
-#include "FACT.h"
 #include "Dim.h"
 #include "Event.h"
@@ -2565 +2564 @@
         vm = conf.Parse(argc, argv);
     }
-    catch (exception &e)
-    {
 #if BOOST_VERSION > 104000
-        po::multiple_occurrences *MO = dynamic_cast<po::multiple_occurrences*>(&e);
-        if (MO)
-            cout << "Error: " << e.what() << " of '" << MO->get_option_name() << "' option." << endl;
-        else
+    catch (po::multiple_occurrences &e)
+    {
+        cerr << "Program options invalid due to: " << e.what() << " of '" << e.get_option_name() << "'." << endl;
+        return -1;
+    }
 #endif
-            cout << "Error: " << e.what() << endl;
-        cout << endl;
-
+    catch (exception& e)
+    {
+        cerr << "Program options invalid due to: " << e.what() << endl;
         return -1;
     }
 
-    if (conf.HasPrint())
+    if (conf.HasVersion() || conf.HasPrint())
         return -1;
-
-    if (conf.HasVersion())
-    {
-        FACT::PrintVersion(argv[0]);
-        return -1;
-    }
 
     if (conf.HasHelp())