Changeset 11481 for trunk/FACT++/src/fscctrl.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/fscctrl.cc (modified) (5 diffs)

trunk/FACT++/src/fscctrl.cc

@@ -1 @@
-#include <boost/bind.hpp>
+#include <functional>
 
 #include "Dim.h"
@@ -11 +11 @@
 
 #include "tools.h"
-
 
 namespace ba    = boost::asio;
@@ -370 +369 @@
     }
 
-    boost::function<int(const EventImp &)> Wrapper(boost::function<void()> func)
-    {
-        return boost::bind(&StateMachineFSC::Wrap, this, func);
+    function<int(const EventImp &)> Wrapper(function<void()> func)
+    {
+        return bind(&StateMachineFSC::Wrap, this, func);
     }
 
@@ -480 +479 @@
         // Verbosity commands
         T::AddEvent("SET_VERBOSE", "B:1")
-            (boost::bind(&StateMachineFSC::SetVerbosity, this, _1))
+            (bind(&StateMachineFSC::SetVerbosity, this, placeholders::_1))
             ("set verbosity state"
              "|verbosity[bool]:disable or enable verbosity for received data (yes/no), except dynamic data");
 
         T::AddEvent("DUMP_STREAM", "B:1")
-            (boost::bind(&StateMachineFSC::SetDumpStream, this, _1))
+            (bind(&StateMachineFSC::SetDumpStream, this, placeholders::_1))
             (""
              "");
@@ -491 +490 @@
         // Conenction commands
         AddEvent("DISCONNECT", kStateConnected)
-            (boost::bind(&StateMachineFSC::Disconnect, this))
+            (bind(&StateMachineFSC::Disconnect, this))
             ("disconnect from ethernet");
 
         AddEvent("RECONNECT", "O", kStateDisconnected, kStateConnected)
-            (boost::bind(&StateMachineFSC::Reconnect, this, _1))
+            (bind(&StateMachineFSC::Reconnect, this, placeholders::_1))
             ("(Re)connect ethernet connection to FTM, a new address can be given"
              "|[host][string]:new ethernet address in the form <host:port>");