summaryrefslogtreecommitdiff
path: root/devel/ice/files/patch-cpp-include-IceUtil-Config.h
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-include-IceUtil-Config.h
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 '')
-rw-r--r--devel/ice/files/patch-cpp-include-IceUtil-Config.h28
1 files changed, 10 insertions, 18 deletions
diff --git a/devel/ice/files/patch-cpp-include-IceUtil-Config.h b/devel/ice/files/patch-cpp-include-IceUtil-Config.h
index 2e513293512a..625a440fb38d 100644
--- a/devel/ice/files/patch-cpp-include-IceUtil-Config.h
+++ b/devel/ice/files/patch-cpp-include-IceUtil-Config.h
@@ -1,19 +1,11 @@
---- cpp.orig/include/IceUtil/Config.h 2011-06-15 21:43:58.000000000 +0200
-+++ cpp/include/IceUtil/Config.h 2012-09-10 11:43:58.000000000 +0200
-@@ -248,3 +248,16 @@ public:
- #define ICE_DEFAULT_MUTEX_PROTOCOL PrioNone
-
+--- cpp.orig/include/IceUtil/Config.h 2013-03-11 15:19:46.000000000 +0000
++++ cpp/include/IceUtil/Config.h 2013-05-20 02:09:58.239194578 +0000
+@@ -51,7 +51,7 @@
+ // Check for C++ 11 support
+ //
+ #if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
+- (defined(__clang__) && (__clang_major__ >= 4) && __cplusplus >= 201103) || \
++ (defined(__clang__) && ((defined(__APPLE__) && __clang_major__ >= 4) || (!defined(__APPLE__) && __clang_major__ >= 3)) && __cplusplus >= 201103) || \
+ (defined(_MSC_VER) && (_MSC_VER >= 1600))
+ # define ICE_CPP11
#endif
-+
-+
-+//
-+// Macro used for declaring destructors that might throw - required for C++11
-+//
-+#if __cplusplus >= 201103L
-+#define ICE_DESTRUCTORS_DONT_THROW_BY_DEFAULT
-+#define ICE_NOEXCEPT_FALSE noexcept(false)
-+#define ICE_NOEXCEPT_TRUE noexcept(true)
-+#else
-+#define ICE_NOEXCEPT_FALSE
-+#define ICE_NOEXCEPT_TRUE
-+#endif