mutex -> boost::mutex

zwizwa · Mar 9, 2014 · d3bbfcf · d3bbfcf
1 parent e8fa694
commit d3bbfcf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/pylacore.h b/pylacore.h
@@ -16,8 +16,6 @@
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
-typedef boost::mutex mutex;
-
 
 /* INTERFACES */
 
@@ -133,7 +131,7 @@ class memory : public buffer {
   ~memory();
  private:
   std::list<boost::shared_ptr<chunk> > _buf;
-  mutex _mutex;
+  boost::mutex _mutex;
   FILE *_log;
 };
 

diff --git a/saleae.cpp b/saleae.cpp
@@ -53,7 +53,7 @@ void __stdcall OnConnect( U64 device_id, GenericInterface* device_interface, voi
 
 /* saleae class */
 std::vector<saleae*> saleae::_device_map;
-mutex* saleae::_device_map_mutex;
+boost::mutex* saleae::_device_map_mutex;
 double saleae::_default_samplerate;
 
 saleae::saleae(U64 device_id, GenericInterface* device_interface) :
@@ -70,7 +70,7 @@ saleae::~saleae() {
 void saleae::start(double samplerate) {
   if (!_device_map_mutex) {
     _default_samplerate = samplerate;
-    _device_map_mutex = new mutex();
+    _device_map_mutex = new boost::mutex();
     DevicesManagerInterface::RegisterOnConnect( &OnConnect );
     DevicesManagerInterface::RegisterOnDisconnect( &OnDisconnect );
     DevicesManagerInterface::BeginConnect();

diff --git a/saleae.h b/saleae.h
@@ -35,12 +35,12 @@ class saleae : public cosink, public sampler {
   GenericInterface* _device_interface;
   double _samplerate;
   boost::shared_ptr<sink> _sink;
-  mutex _sink_mutex;
+  boost::mutex _sink_mutex;
 
   /* Registry owns saleae instances
      Never delete a saleae object, nor remove it from this list. */
   static std::vector<saleae*> _device_map;
-  static mutex *_device_map_mutex;
+  static boost::mutex *_device_map_mutex;
   static double _default_samplerate;
 };