summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/objects/Client.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-12-28 16:02:31 +0100
committerJose <jose@zeroc.com>2015-12-28 16:02:31 +0100
commit99f4220ab2973aa8eebfb95aaf4781e67fb890d9 (patch)
tree541b67563e235c827c5eebb9be5733d540788ef9 /cpp/test/Ice/objects/Client.cpp
parentFixed RPATH issue to find TestCommon with /usr installs (diff)
parentObject factory registration fix for VS 2015 (diff)
downloadice-99f4220ab2973aa8eebfb95aaf4781e67fb890d9.tar.bz2
ice-99f4220ab2973aa8eebfb95aaf4781e67fb890d9.tar.xz
ice-99f4220ab2973aa8eebfb95aaf4781e67fb890d9.zip
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/test/Ice/objects/Client.cpp')
-rw-r--r--cpp/test/Ice/objects/Client.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/test/Ice/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp
index 21bc3e9d4a7..ec6aa28674c 100644
--- a/cpp/test/Ice/objects/Client.cpp
+++ b/cpp/test/Ice/objects/Client.cpp
@@ -10,6 +10,8 @@
#include <Ice/Ice.h>
#include <TestCommon.h>
#include <TestI.h>
+#include <Derived.h>
+#include <DerivedEx.h>
DEFINE_TEST("client")