X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fid.cc;h=9a610c7418e4135f6980653375e4d42a40746642;hb=6d343ba3c607f5210ae03edb17ba51d662c7f79b;hp=d7ac1560a1c6698f7b37f0d18ec4531b04ceace4;hpb=4085309cdb07f011756a9ab90047037ef9ad8f20;p=ardour.git diff --git a/libs/pbd/id.cc b/libs/pbd/id.cc index d7ac1560a1..9a610c7418 100644 --- 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 -#include #include #ifndef __STDC_FORMAT_MACROS @@ -32,14 +31,14 @@ 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 () @@ -60,9 +59,9 @@ ID::ID (string str) void ID::reset () { - Glib::Mutex::Lock lm (*counter_lock); + Glib::Threads::Mutex::Lock lm (*counter_lock); _id = _counter++; -} +} int ID::string_assign (string str)