summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/test/Ice/objects/AllTests.cpp10
-rw-r--r--cpp/test/Ice/objects/Client.cpp10
-rw-r--r--cpp/test/Ice/objects/Collocated.cpp10
3 files changed, 30 insertions, 0 deletions
diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp
index 6b7437f20c9..6ebfa5d1a0b 100644
--- a/cpp/test/Ice/objects/AllTests.cpp
+++ b/cpp/test/Ice/objects/AllTests.cpp
@@ -11,6 +11,16 @@
#include <TestCommon.h>
#include <Test.h>
+#ifdef _MSC_VER
+// For 'Ice::Communicator::addObjectFactory()' deprecation
+#pragma warning( disable : 4996 )
+#endif
+
+#if defined(__GNUC__)
+// For 'Ice::Communicator::addObjectFactory()' deprecation
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
using namespace std;
using namespace Test;
diff --git a/cpp/test/Ice/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp
index 02f6d2363e2..92156aa8896 100644
--- a/cpp/test/Ice/objects/Client.cpp
+++ b/cpp/test/Ice/objects/Client.cpp
@@ -13,6 +13,16 @@
DEFINE_TEST("client")
+#ifdef _MSC_VER
+// For 'Ice::Communicator::addObjectFactory()' deprecation
+#pragma warning( disable : 4996 )
+#endif
+
+#if defined(__GNUC__)
+// For 'Ice::Communicator::addObjectFactory()' deprecation
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
using namespace std;
using namespace Test;
diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp
index bfe5f685f1a..1381407bb39 100644
--- a/cpp/test/Ice/objects/Collocated.cpp
+++ b/cpp/test/Ice/objects/Collocated.cpp
@@ -13,6 +13,16 @@
DEFINE_TEST("collocated")
+#ifdef _MSC_VER
+// For 'Ice::Communicator::addObjectFactory()' deprecation
+#pragma warning( disable : 4996 )
+#endif
+
+#if defined(__GNUC__)
+// For 'Ice::Communicator::addObjectFactory()' deprecation
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
using namespace std;
using namespace Test;