summaryrefslogtreecommitdiff
path: root/devel/ice/files/patch-cpp-include-Ice-Stream.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-Ice-Stream.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-Ice-Stream.h90
1 files changed, 0 insertions, 90 deletions
diff --git a/devel/ice/files/patch-cpp-include-Ice-Stream.h b/devel/ice/files/patch-cpp-include-Ice-Stream.h
deleted file mode 100644
index bdd4e827fd53..000000000000
--- a/devel/ice/files/patch-cpp-include-Ice-Stream.h
+++ /dev/null
@@ -1,90 +0,0 @@
---- cpp.orig/include/Ice/Stream.h 2011-06-15 21:43:58.000000000 +0200
-+++ cpp/include/Ice/Stream.h 2012-03-04 20:14:52.000000000 +0100
-@@ -17,6 +17,12 @@
- #include <Ice/Proxy.h>
- #include <IceUtil/Shared.h>
-
-+namespace IceInternal
-+{
-+ // Forward declaration required for writer specializations.
-+ void delegateThrowMarshalException(const char*, int, const ::std::string&);
-+}
-+
- namespace Ice
- {
-
-@@ -45,9 +51,6 @@
- StreamTraitTypeUnknown
- };
-
--// Forward declaration required for writer specializations.
--class MarshalException;
--
- //
- // Base trait template. This doesn't actually do anything -- we just
- // use it as a template that we can specialize.
-@@ -542,7 +545,7 @@
- {
- if(static_cast<int>(v) < 0 || static_cast<int>(v) >= StreamTrait<T>::enumLimit)
- {
-- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
-+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
- }
- outS->write(static_cast<Byte>(v));
- }
-@@ -558,7 +561,7 @@
- inS->read(val);
- if(val > StreamTrait<T>::enumLimit)
- {
-- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
-+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
- }
- v = static_cast<T>(val);
- }
-@@ -573,7 +576,7 @@
- {
- if(static_cast<int>(v) < 0 || static_cast<int>(v) >= StreamTrait<T>::enumLimit)
- {
-- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
-+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
- }
- outS->write(static_cast<Short>(v));
- }
-@@ -589,7 +592,7 @@
- inS->read(val);
- if(val < 0 || val > StreamTrait<T>::enumLimit)
- {
-- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
-+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
- }
- v = static_cast<T>(val);
- }
-@@ -603,7 +606,7 @@
- {
- if(static_cast<int>(v) < 0 || static_cast<int>(v) >= StreamTrait<T>::enumLimit)
- {
-- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
-+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
- }
- outS->write(static_cast<Int>(v));
- }
-@@ -619,7 +622,7 @@
- inS->read(val);
- if(val < 0 || val > StreamTrait<T>::enumLimit)
- {
-- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
-+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
- }
- v = static_cast<T>(val);
- }
---- cpp.orig/include/Ice/Stream.h 2011-06-15 21:43:58.000000000 +0200
-+++ cpp/include/Ice/Stream.h 2012-09-10 11:43:58.000000000 +0200
-@@ -664,7 +664,7 @@ struct StreamWriter<StreamTraitTypeSequenceBool>
- outS->writeSize(static_cast<Int>(v.size()));
- for(typename T::const_iterator p = v.begin(); p != v.end(); ++p)
- {
-- outS->write(*p);
-+ outS->write(static_cast<bool>(*p));
- }
- }
- };