projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avoid a set of calls to gettext() and/or cousins from global constructor scope
[ardour.git]
/
libs
/
pbd
/
id.cc
diff --git
a/libs/pbd/id.cc
b/libs/pbd/id.cc
index d7ac1560a1c6698f7b37f0d18ec4531b04ceace4..24cf02ab2ea6f2a0d9591355cb04e2d452a969d4 100644
(file)
--- a/
libs/pbd/id.cc
+++ b/
libs/pbd/id.cc
@@
-18,7
+18,6
@@
*/
#include <ostream>
*/
#include <ostream>
-#include <iostream>
#include <stdio.h>
#ifndef __STDC_FORMAT_MACROS
#include <stdio.h>
#ifndef __STDC_FORMAT_MACROS
@@
-32,14
+31,14
@@
using namespace std;
using namespace PBD;
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)
uint64_t ID::_counter = 0;
void
ID::init ()
{
if (!counter_lock)
- counter_lock = new Glib::Mutex;
+ counter_lock = new Glib::
Threads::
Mutex;
}
ID::ID ()
}
ID::ID ()
@@
-60,7
+59,7
@@
ID::ID (string str)
void
ID::reset ()
{
void
ID::reset ()
{
- Glib::Mutex::Lock lm (*counter_lock);
+ Glib::
Threads::
Mutex::Lock lm (*counter_lock);
_id = _counter++;
}
_id = _counter++;
}