Changeset 10230

Timestamp:

03/09/11 08:35:04 (14 years ago)

Author:

tbretz

Message:

Added compatibility with boost V1.40

Location:

trunk/FACT++

Files:

• configure (modified) (1 diff)
• configure.ac (modified) (1 diff)
• src/Configuration.cc (modified) (7 diffs)
• src/argv.cc (modified) (1 diff)
• src/dclient5.cc (modified) (1 diff)
• src/test3.cc (modified) (1 diff)

trunk/FACT++/configure

@@ -18120 +18120 @@
 
 if test "x$want_boost" = "xyes"; then
-        boost_lib_version_req=1.42
+        boost_lib_version_req=1.40
         boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([0-9]*\.[0-9]*\)'`
         boost_lib_version_req_major=`expr $boost_lib_version_req : '\([0-9]*\)'`

trunk/FACT++/configure.ac

@@ -120 +120 @@
 ######################################################################
 
-AX_BOOST_BASE([1.42], [],
+AX_BOOST_BASE([1.40], [],
    [
       echo "Error! The boost C++ libraries are not properly installed." 

trunk/FACT++/src/Configuration.cc

@@ -264 +264 @@
 #include "Configuration.h"
 
+#include <fstream>
 #include <iostream>
 
 #include <boost/regex.hpp>
-#include <boost/filesystem.hpp>
+//#include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
 
@@ -759 +760 @@
 //!    - describe what happens in a more general way
 //!    - print a waring when no default coonfig file is read
+//!    - proper handling and error messages if files not available
 //
 const po::variables_map &Configuration::Parse(int argc, char **argv)
@@ -829 +831 @@
     const bool checkf    = !getfiles.count("dont-check-files") && !getfiles.count("dont-check");
     const bool defaulted = getfiles.count("default") && getfiles["default"].defaulted();
-    const bool exists    = boost::filesystem::exists(fDefaultFile);
-
+    //const bool exists    = boost::filesystem::exists(fDefaultFile);
+
+    ifstream indef(fDefaultFile.c_str());
+    // ===> FIXME: Proper handling of missing file or wrong file name
     const po::parsed_options parsed_defaultfile =
-        !exists && defaulted ?
+        !indef && defaulted ?
         po::parsed_options(&opt_configfile) :
-        po::parse_config_file<char>(fDefaultFile.c_str(), opt_configfile, !checkf);
+        po::parse_config_file<char>(indef, opt_configfile, !checkf);
 
     // ------------------------ (6) --------------------------
@@ -840 +844 @@
     if (getfiles.count("print-default") || getfiles.count("print-all"))
     {
-        if (!exists && defaulted)
+        if (!indef && defaulted)
             cout << "No configuration file by --default option specified." << endl;
         else
@@ -861 +865 @@
     }
 
-    //        cout << "PRIO : " << fPriorityFile << endl;
-
+    ifstream inpri(fPriorityFile.c_str());
+    // ===> FIXME: Proper handling of missing file or wrong file name
     const po::parsed_options parsed_priorityfile =
         fPriorityFile.empty() ? po::parsed_options(&opt_configfile) :
-        po::parse_config_file<char>(fPriorityFile.c_str(), opt_configfile, !checkf);
+        po::parse_config_file<char>(inpri, opt_configfile, !checkf);
 
     // ------------------------ (8) --------------------------
@@ -888 +892 @@
     po::store(parsed_defaultfile,  getdatabase);
 
-    //        cout << "NODB : " << getdatabase.count("no-database") << endl;
-
     if (getdatabase.count("database") && !getdatabase.count("no-database"))
     {
@@ -896 +898 @@
     }
 
-    //        cout << "DB   : " << fDatabase << endl;
     const bool checkdb = !getdatabase.count("dont-check-database") && !getdatabase.count("dont-check");
 

trunk/FACT++/src/argv.cc

@@ -149 +149 @@
     catch (std::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
+#endif
             cout << "Error: " << e.what() << endl;
         cout << endl;

trunk/FACT++/src/dclient5.cc

@@ -491 +491 @@
     catch (std::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
+#endif
             cout << "Error: " << e.what() << endl;
         cout << endl;

trunk/FACT++/src/test3.cc

@@ -62 +62 @@
     catch (std::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
+#endif
             cout << "Error: " << e.what() << endl;
         cout << endl;