summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2022-01-11 11:58:17 -0500
committerGitHub <noreply@github.com>2022-01-11 11:58:17 -0500
commit321208a6e971cee402421713881806e0282e6a4b (patch)
tree9be24ba94a16f4a9c6cce070f6095871ddf59c81
parentFix for potential CFStream/NSStream deadlock with the iOS transports (#1329) (diff)
downloadice-3.7.7-rc1.tar.bz2
ice-3.7.7-rc1.tar.xz
ice-3.7.7-rc1.zip
Restore binary compatibility with Ice 3.7.5 (Fixes #1328) (#1330)v3.7.7-rc1
-rw-r--r--cpp/include/Ice/Object.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h
index af0ae939bc9..7fb3afdf8b6 100644
--- a/cpp/include/Ice/Object.h
+++ b/cpp/include/Ice/Object.h
@@ -332,7 +332,9 @@ protected:
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wdeprecated-copy-dtor"
+#endif
virtual ~Object() {}
+#if defined(__clang__)
# pragma clang diagnostic pop
#endif