blob: ddc8cc01ea8b1daab6bc13d3fa584b6d98f89856 (
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
|
--- cpp.orig/src/Ice/Stream.cpp 2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/Ice/Stream.cpp 2012-03-04 20:14:53.000000000 +0100
@@ -8,10 +8,19 @@
// **********************************************************************
#include <Ice/Stream.h>
+#include <Ice/LocalException.h>
using namespace std;
using namespace Ice;
using namespace IceInternal;
-IceUtil::Shared* IceInternal::upCast(InputStream* p) { return p; }
-IceUtil::Shared* IceInternal::upCast(OutputStream* p) { return p; }
+IceUtil::Shared* Ice::upCast(InputStream* p) { return p; }
+IceUtil::Shared* Ice::upCast(OutputStream* p) { return p; }
+
+namespace IceInternal
+{
+ void delegateThrowMarshalException(const char* file, int line , const ::std::string& message)
+ {
+ throw Ice::MarshalException(file, line, message);
+ }
+}
|