From bfdb09d97b1b649e6a634dc2d3d1ff6a14d25644 Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Thu, 23 Jan 2025 17:41:14 -0500 Subject: [PATCH] Fix ios build failure --- cpp/src/Ice/Selector.h | 9 +++++++++ cpp/src/Ice/ios/StreamEndpointI.cpp | 2 ++ cpp/src/Ice/ios/StreamEndpointI.h | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cpp/src/Ice/Selector.h b/cpp/src/Ice/Selector.h index 0bd41cc4d46..8664233b41e 100644 --- a/cpp/src/Ice/Selector.h +++ b/cpp/src/Ice/Selector.h @@ -37,6 +37,11 @@ struct __CFSocket; typedef struct __CFSocket* CFSocketRef; #endif +#ifdef __clang__ +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wweak-vtables" +#endif + namespace IceInternal { // @@ -232,4 +237,8 @@ namespace IceInternal #endif } +#ifdef __clang__ +# pragma clang diagnostic pop +#endif + #endif diff --git a/cpp/src/Ice/ios/StreamEndpointI.cpp b/cpp/src/Ice/ios/StreamEndpointI.cpp index 0ac4de15446..0e2d81e6b94 100644 --- a/cpp/src/Ice/ios/StreamEndpointI.cpp +++ b/cpp/src/Ice/ios/StreamEndpointI.cpp @@ -77,6 +77,8 @@ IceObjC::Instance::Instance(const Ice::CommunicatorPtr& communicator, int16_t ty } } +IceObjC::Instance::~Instance() = default; + void IceObjC::Instance::setupStreams( CFReadStreamRef readStream, diff --git a/cpp/src/Ice/ios/StreamEndpointI.h b/cpp/src/Ice/ios/StreamEndpointI.h index c6fc4cfafc2..5bd5a5a6ed2 100644 --- a/cpp/src/Ice/ios/StreamEndpointI.h +++ b/cpp/src/Ice/ios/StreamEndpointI.h @@ -35,7 +35,7 @@ namespace IceObjC { public: Instance(const Ice::CommunicatorPtr&, std::int16_t, const std::string&, bool); - ~Instance() = default; + ~Instance() override; const std::string& proxyHost() const { return _proxyHost; }