blob: 83102598cbd8a17a528c289f852ba6926b5f9fce (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
--- cpp.orig/src/slice2py/Main.cpp 2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/slice2py/Main.cpp 2012-09-10 11:43:58.000000000 +0200
@@ -40,7 +40,7 @@ using namespace Slice::Python;
namespace
{
-IceUtil::Mutex* mutex = 0;
+IceUtil::Mutex* mtx = 0;
bool interrupted = false;
class Init
@@ -49,13 +49,13 @@ public:
Init()
{
- mutex = new IceUtil::Mutex;
+ mtx = new IceUtil::Mutex;
}
~Init()
{
- delete mutex;
- mutex = 0;
+ delete mtx;
+ mtx = 0;
}
};
@@ -66,7 +66,7 @@ Init init;
void
interruptedCallback(int signal)
{
- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
interrupted = true;
}
@@ -631,7 +631,7 @@ compile(int argc, char* argv[])
}
{
- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
if(interrupted)
{
|