/*
- 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
*/
#include <ostream>
-#include <iostream>
#include <stdio.h>
#ifndef __STDC_FORMAT_MACROS
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)
string_assign (str);
}
+void
+ID::reset ()
+{
+ Glib::Threads::Mutex::Lock lm (*counter_lock);
+ _id = _counter++;
+}
+
int
ID::string_assign (string str)
{