missing include for rand() in self-tests

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

diff --git a/libs/pbd/id.cc b/libs/pbd/id.cc
index 25c96c305e624c27afef950b6a3a33624a749bb7..9a610c7418e4135f6980653375e4d42a40746642 100644 (file)
--- a/libs/pbd/id.cc
+++ b/libs/pbd/id.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,7 +18,6 @@
 */
 
 #include <ostream>
-#include <iostream>
 #include <stdio.h>
 
 #ifndef __STDC_FORMAT_MACROS
@@ -32,20 +31,24 @@
 using namespace std;
 using namespace PBD;
 
-Glib::Mutex* ID::counter_lock = 0;
+Glib::Threads::Mutex* ID::counter_lock = 0;
 uint64_t ID::_counter = 0;
 
 void
 ID::init ()
 {
        if (!counter_lock)
-               counter_lock = new Glib::Mutex;
+               counter_lock = new Glib::Threads::Mutex;
 }
 
 ID::ID ()
 {
-       Glib::Mutex::Lock lm (*counter_lock);
-       _id = _counter++;
+       reset ();
+}
+
+ID::ID (const ID& other)
+{
+       _id = other._id;
 }
 
 ID::ID (string str)
@@ -53,6 +56,13 @@ ID::ID (string str)
        string_assign (str);
 }
 
+void
+ID::reset ()
+{
+       Glib::Threads::Mutex::Lock lm (*counter_lock);
+       _id = _counter++;
+}
+
 int
 ID::string_assign (string str)
 {
@@ -85,6 +95,15 @@ ID::operator= (string str)
        return *this;
 }
 
+ID&
+ID::operator= (const ID& other)
+{
+       if (&other != this) {
+               _id = other._id;
+       }
+       return *this;
+}
+
 ostream&
 operator<< (ostream& ostr, const ID& _id)
 {