summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
authorJose <pepone@users.noreply.github.com>2021-05-24 21:27:48 +0200
committerGitHub <noreply@github.com>2021-05-24 21:27:48 +0200
commit040058e5a606e60ca1c48653b373277f03f2e7da (patch)
tree92a2e41901cf62efeaa777a527d857c4234f4e10 /cpp/test
parentFix reading of interface by value in JavaScript (#1278) (diff)
downloadice-040058e5a606e60ca1c48653b373277f03f2e7da.tar.bz2
ice-040058e5a606e60ca1c48653b373277f03f2e7da.tar.xz
ice-040058e5a606e60ca1c48653b373277f03f2e7da.zip
g++11 build fixes (#1279)
Diffstat (limited to 'cpp/test')
-rw-r--r--cpp/test/Ice/interceptor/MyObjectI.cpp1
-rw-r--r--cpp/test/Slice/escape/Client.cpp9
2 files changed, 6 insertions, 4 deletions
diff --git a/cpp/test/Ice/interceptor/MyObjectI.cpp b/cpp/test/Ice/interceptor/MyObjectI.cpp
index f3164ac4426..1966bf79362 100644
--- a/cpp/test/Ice/interceptor/MyObjectI.cpp
+++ b/cpp/test/Ice/interceptor/MyObjectI.cpp
@@ -6,6 +6,7 @@
#include <MyObjectI.h>
#include <TestHelper.h>
#include <IceUtil/IceUtil.h>
+#include <thread>
using namespace IceUtil;
using namespace std;
diff --git a/cpp/test/Slice/escape/Client.cpp b/cpp/test/Slice/escape/Client.cpp
index 01c922c0a85..664d2fe79fc 100644
--- a/cpp/test/Slice/escape/Client.cpp
+++ b/cpp/test/Slice/escape/Client.cpp
@@ -114,8 +114,7 @@ public:
// This section of the test is present to ensure that the C++ types
// are named correctly. It is not expected to run.
//
-void
-testtypes()
+void testtypes(const Ice::CommunicatorPtr& communicator)
{
#ifdef ICE_CPP11_MAPPING
_cpp_and::_cpp_continue a = _cpp_and::_cpp_continue::_cpp_asm;
@@ -138,12 +137,14 @@ testtypes()
c->_cpp_else = "";
#endif
- _cpp_and::breakPrxPtr d;
+ _cpp_and::breakPrxPtr d =
+ ICE_UNCHECKED_CAST(_cpp_and::breakPrx, communicator->stringToProxy("hello:tcp -h 127.0.0.1 -p 12010"));
int d2;
d->_cpp_case(0, d2);
_cpp_and::breakPtr d1 = ICE_MAKE_SHARED(breakI);
- _cpp_and::charPrxPtr e;
+ _cpp_and::charPrxPtr e =
+ ICE_UNCHECKED_CAST(_cpp_and::charPrx, communicator->stringToProxy("hello:tcp -h 127.0.0.1 -p 12010"));
e->_cpp_explicit();
_cpp_and::charPtr e1 = ICE_MAKE_SHARED(charI);