diff options
| author | Bernard Normier <bernard@zeroc.com> | 2018-09-19 17:28:58 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2018-09-19 17:28:58 -0400 |
| commit | e0a0f0c5b6a5e5680f6687b5c7a447c9f7f370ac (patch) | |
| tree | ddaca99e297f48f1121da4ed4185f29633095c47 /cpp/include | |
| parent | Removed Application from Ice Services (#196) (diff) | |
| parent | Fixed bug where component libs/systemlib wouldn't be added to linker flags wh... (diff) | |
| download | ice-e0a0f0c5b6a5e5680f6687b5c7a447c9f7f370ac.tar.bz2 ice-e0a0f0c5b6a5e5680f6687b5c7a447c9f7f370ac.tar.xz ice-e0a0f0c5b6a5e5680f6687b5c7a447c9f7f370ac.zip | |
Merge branch '3.7.1-xcode10' into 3.7
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 a360be048ee..728cb381b3a 100644 --- a/cpp/include/Ice/MetricsObserverI.h +++ b/cpp/include/Ice/MetricsObserverI.h @@ -331,7 +331,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 // |