merged

dlib/test/pipe.cpp

@@ -22,7 +22,7 @@ namespace
     namespace pipe_kernel_test_helpers
     {
         const unsigned long proc1_count = 10000;
-        mutex m;
+        dlib::mutex m;
         signaler s(m);
         unsigned long threads_running = 0;
         bool found_error;

dlib/test/read_write_mutex.cpp

@@ -42,7 +42,7 @@ namespace
 
         read_write_mutex m;
 
-        mutex mut;
+        dlib::mutex mut;
         int num_write;
         int num_read;
         int max_read;

dlib/test/timer.cpp

@@ -23,7 +23,7 @@ namespace
     class timer_test_helper
     {
     public:
-        mutex m;
+        dlib::mutex m;
         int count;
         dlib::uint64 timestamp;
         dlib::timestamper ts;