c1436fa4e5
. fix built using Clang in C++11 mode and libc++ (-std=c++11 -stdlib=libc++); . incorporate a patch that fixes an assert bug in IceStrom; . adopt new-style options; While I'm here: . adopt new-style headers; . remove indefinite article form COMMENT; . remove library versions from LIB_DEPENDS. PR: ports/171643 Submitted by: Michael Gmelin <freebsd@grem.de> (maintainer)
46 lines
1 KiB
C++
46 lines
1 KiB
C++
--- cpp.orig/src/slice2php/Main.cpp 2011-06-15 21:43:58.000000000 +0200
|
|
+++ cpp/src/slice2php/Main.cpp 2012-09-10 11:43:58.000000000 +0200
|
|
@@ -1488,7 +1488,7 @@ printHeader(IceUtilInternal::Output& out)
|
|
namespace
|
|
{
|
|
|
|
-IceUtil::Mutex* mutex = 0;
|
|
+IceUtil::Mutex* mtx = 0;
|
|
bool interrupted = false;
|
|
|
|
class Init
|
|
@@ -1497,13 +1497,13 @@ public:
|
|
|
|
Init()
|
|
{
|
|
- mutex = new IceUtil::Mutex;
|
|
+ mtx = new IceUtil::Mutex;
|
|
}
|
|
|
|
~Init()
|
|
{
|
|
- delete mutex;
|
|
- mutex = 0;
|
|
+ delete mtx;
|
|
+ mtx = 0;
|
|
}
|
|
};
|
|
|
|
@@ -1514,7 +1514,7 @@ Init init;
|
|
static void
|
|
interruptedCallback(int signal)
|
|
{
|
|
- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
|
|
+ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
|
|
|
|
interrupted = true;
|
|
}
|
|
@@ -1777,7 +1777,7 @@ compile(int argc, char* argv[])
|
|
}
|
|
|
|
{
|
|
- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
|
|
+ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
|
|
|
|
if(interrupted)
|
|
{
|