Changeset 573 for trunk

Timestamp:

07/27/11 13:30:58 (10 months ago)

Author:

ddangelo

Message:

Typedef for boost threads added. Needed to be compliant with boost > 1.40

Location:

trunk/avango-daemon

Files:

• include/avango/daemon/Device.h (modified) (2 diffs)
• src/avango/daemon/Device.cpp (modified) (1 diff)

trunk/avango-daemon/include/avango/daemon/Device.h

@@ -29 +29 @@
 #include <map>
 #include <boost/shared_ptr.hpp>
-#include <boost/thread/thread.hpp>
 #include <avango/Base.h>
 #include <avango/daemon/Station.h>
+
+#if BOOST_VERSION > 104000
+#include <boost/thread.hpp>
+namespace av
+{
+typedef ::boost::thread Thread;
+}
+#else
+#include <boost/thread/thread.hpp>
+namespace av
+{
+  typedef ::boost::thread Thread;
+}
+#endif
 
 /**
@@ -162 +175 @@
       const std::string mEmptyFeature;
 
-      ::boost::shared_ptr< ::boost::thread::thread> mThread;
+      ::boost::shared_ptr< av::Thread > mThread;
       bool mRunning;
     };

trunk/avango-daemon/src/avango/daemon/Device.cpp

@@ -69 +69 @@
   startDevice();
   mKeepRunning = true;
-  mThread.reset(new boost::thread::thread(boost::bind(&av::daemon::Device::threadFunction, this)));
+  mThread.reset(new Thread(boost::bind(&av::daemon::Device::threadFunction, this)));
   mRunning = true;
   return true;