summaryrefslogtreecommitdiff
path: root/devel/ice/files/patch-cpp-src-slice2java-Main.cpp
diff options
context:
space:
mode:
authorRuslan Makhmatkhanov <rm@FreeBSD.org>2013-06-17 11:42:41 +0000
committerRuslan Makhmatkhanov <rm@FreeBSD.org>2013-06-17 11:42:41 +0000
commit58e60f6909d832bb6100e9a168f002a14d4214ef (patch)
tree3676c05fa6760a824faa9ecb99d28794fb4563c8 /devel/ice/files/patch-cpp-src-slice2java-Main.cpp
parentUpdate dialog4ports to 0.1.5 (diff)
- update to 3.5.0
- add license (GPLv2) - switch to bdb 5 - mark broken on 10.x for the time being (as it was discussed on ports@ ML) - remove patches, applied upstream This version of Ice brings many new features, e.g. - New encoding version - Metrics facility - Optional data members and parameters - Compact encoding for classes and exceptions - Compact type IDs - Preserved slices - Custom enumerator values - C++11 lambda functions - Remote Update of Server Properties - IPv6 now enabled by default - Python 3 support - Use Berkley DB 5 See http://doc.zeroc.com/display/Ice/Release+Notes for details. PR: 179233 Submitted by: Michael Gmelin <freebsd@grem.de> (maintainer) Tested by: Jaret Bartsch <jaretbartsch@yahoo.ca>
Notes
Notes: svn path=/head/; revision=321096
Diffstat (limited to 'devel/ice/files/patch-cpp-src-slice2java-Main.cpp')
-rw-r--r--devel/ice/files/patch-cpp-src-slice2java-Main.cpp46
1 files changed, 0 insertions, 46 deletions
diff --git a/devel/ice/files/patch-cpp-src-slice2java-Main.cpp b/devel/ice/files/patch-cpp-src-slice2java-Main.cpp
deleted file mode 100644
index 9b05b32e4621..000000000000
--- a/devel/ice/files/patch-cpp-src-slice2java-Main.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
---- cpp.orig/src/slice2java/Main.cpp 2011-06-15 21:43:58.000000000 +0200
-+++ cpp/src/slice2java/Main.cpp 2012-09-10 11:43:58.000000000 +0200
-@@ -23,7 +23,7 @@ using namespace Slice;
- namespace
- {
-
--IceUtil::Mutex* mutex = 0;
-+IceUtil::Mutex* mtx = 0;
- bool interrupted = false;
-
- class Init
-@@ -32,13 +32,13 @@ public:
-
- Init()
- {
-- mutex = new IceUtil::Mutex;
-+ mtx = new IceUtil::Mutex;
- }
-
- ~Init()
- {
-- delete mutex;
-- mutex = 0;
-+ delete mtx;
-+ mtx = 0;
- }
- };
-
-@@ -49,7 +49,7 @@ Init init;
- void
- interruptedCallback(int signal)
- {
-- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
-+ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
-
- interrupted = true;
- }
-@@ -356,7 +356,7 @@ compile(int argc, char* argv[])
- }
-
- {
-- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
-+ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
-
- if(interrupted)
- {