diff options
| author | Bernard Normier <bernard@zeroc.com> | 2018-09-19 14:03:48 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2018-09-19 14:03:48 -0400 |
| commit | 3eda9b121a49eabdb95b170c513a2d4d2c788e65 (patch) | |
| tree | 9981e17d36e649009533e10f01e97b06aa570587 /cpp/include | |
| parent | Fixed URLs for 3rd party repositories (diff) | |
| download | ice-3eda9b121a49eabdb95b170c513a2d4d2c788e65.tar.bz2 ice-3eda9b121a49eabdb95b170c513a2d4d2c788e65.tar.xz ice-3eda9b121a49eabdb95b170c513a2d4d2c788e65.zip | |
Fix Xcode 10 warnings
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/Ice/MetricsObserverI.h | 2 | ||||
| -rw-r--r-- | cpp/include/IceUtil/Config.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cpp/include/Ice/MetricsObserverI.h b/cpp/include/Ice/MetricsObserverI.h index d5848d2f4ae..6c1863c8284 100644 --- a/cpp/include/Ice/MetricsObserverI.h +++ b/cpp/include/Ice/MetricsObserverI.h @@ -317,7 +317,7 @@ public: }; ICE_DEFINE_PTR(UpdaterPtr, Updater); -template<typename T> class UpdaterT : public Updater +template<typename T> class UpdaterT ICE_FINAL : public Updater { public: diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 71eb5623b82..48163dd96ab 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -119,9 +119,11 @@ #if defined(ICE_CPP11_COMPILER) && (!defined(_MSC_VER) || (_MSC_VER >= 1900)) # define ICE_NOEXCEPT noexcept # define ICE_NOEXCEPT_FALSE noexcept(false) +# define ICE_FINAL final #else # define ICE_NOEXCEPT throw() # define ICE_NOEXCEPT_FALSE /**/ +# define ICE_FINAL /**/ #endif // |