Merge branch 'master' into windows

[ardour.git] / libs / pbd / pbd / id.h

diff --git a/libs/pbd/pbd/id.h b/libs/pbd/pbd/id.h
index 7a32a29002c6f24004e659f50737c0ef0866f1e7..6a9332be53b603fe6c6ef7a9bd016285ef8405a9 100644 (file)
--- a/libs/pbd/pbd/id.h
+++ b/libs/pbd/pbd/id.h
@@ -23,7 +23,7 @@
 #include <stdint.h>
 #include <string>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 namespace PBD {
 
@@ -33,6 +33,8 @@ class ID {
        ID (std::string);
        ID (const ID&);
 
+       void reset ();
+
        bool operator== (const ID& other) const {
                return _id == other._id; 
        }
@@ -61,7 +63,7 @@ class ID {
        uint64_t _id;
        int string_assign (std::string);
 
-       static Glib::Mutex* counter_lock;
+       static Glib::Threads::Mutex* counter_lock;
        static uint64_t _counter;
 };