projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 3f87a65e0d57f91dbb7d7ba6d0d590fdfc85fcfe..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 <stdint.h>
#include <string>
-#include <glibmm/thread.h>
+#include <glibmm/thread
s
.h>
namespace PBD {
namespace PBD {
@@
-31,7
+31,10
@@
class ID {
public:
ID ();
ID (std::string);
public:
ID ();
ID (std::string);
-
+ ID (const ID&);
+
+ void reset ();
+
bool operator== (const ID& other) const {
return _id == other._id;
}
bool operator== (const ID& other) const {
return _id == other._id;
}
@@
-40,7
+43,10
@@
class ID {
return _id != other._id;
}
return _id != other._id;
}
+ bool operator== (const std::string&) const;
+
ID& operator= (std::string);
ID& operator= (std::string);
+ ID& operator= (const ID&);
bool operator< (const ID& other) const {
return _id < other._id;
bool operator< (const ID& other) const {
return _id < other._id;
@@
-57,7
+63,7
@@
class ID {
uint64_t _id;
int string_assign (std::string);
uint64_t _id;
int string_assign (std::string);
- static Glib::Mutex* counter_lock;
+ static Glib::
Threads::
Mutex* counter_lock;
static uint64_t _counter;
};
static uint64_t _counter;
};