Changeset 11481 for trunk/FACT++/src/Configuration.cc

Timestamp:

07/20/11 08:03:38 (13 years ago)

Author:

tbretz

Message:

Replaced boost::thread by std::thread and boost::bind by std::bind from the C++0x standard

File:

• trunk/FACT++/src/Configuration.cc (modified) (7 diffs)

trunk/FACT++/src/Configuration.cc

@@ -332 +332 @@
 #include <iomanip>
 
-#include <boost/bind.hpp>
 #include <boost/regex.hpp>
 #include <boost/filesystem.hpp>
@@ -512 +511 @@
 Configuration::Configuration(const string &prgname) : fName(UnLibToolize(prgname)),
 fNameMapper(bind1st(mem_fun(&Configuration::DefaultMapper), this)),
-fPrintUsage(boost::bind(&Configuration::PrintUsage, this))
+fPrintUsage(bind(&Configuration::PrintUsage, this))
 {
     po::options_description generic("Generic options");
@@ -877 +876 @@
 //!
 //
-void Configuration::SetNameMapper(const boost::function<string(string)> &func)
+void Configuration::SetNameMapper(const function<string(string)> &func)
 {
     fNameMapper = func;
@@ -887 +886 @@
 }
 
-void Configuration::SetPrintUsage(const boost::function<void(void)> &func)
+void Configuration::SetPrintUsage(const function<void(void)> &func)
 {
     fPrintUsage = func;
@@ -894 +893 @@
 void Configuration::SetPrintUsage()
 {
-    fPrintUsage = boost::bind(&Configuration::PrintUsage, this);
-}
-
-void Configuration::SetPrintVersion(const boost::function<void(const string&)> &func)
+    fPrintUsage = bind(&Configuration::PrintUsage, this);
+}
+
+void Configuration::SetPrintVersion(const function<void(const string&)> &func)
 {
     fPrintVersion = func;
@@ -904 +903 @@
 void Configuration::SetPrintVersion()
 {
-    fPrintVersion = boost::function<void(const string&)>();
+    fPrintVersion = function<void(const string&)>();
 }
 
@@ -1310 +1309 @@
 #endif
 
-    if (!fPrintVersion.empty())
+    if (fPrintVersion)
     {
         fPrintVersion(fName);