diff options
| author | Jose <jose@zeroc.com> | 2018-04-17 20:07:28 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2018-04-17 20:07:28 +0200 |
| commit | 7d2dfaddb94993b1f0cbf3adf8d00146812ff4a8 (patch) | |
| tree | 93b9001717355f99b2fddf8156e3b2007e7acc51 /cpp/include | |
| parent | Better handling of UWP test controller dependencies (diff) | |
| download | ice-7d2dfaddb94993b1f0cbf3adf8d00146812ff4a8.tar.bz2 ice-7d2dfaddb94993b1f0cbf3adf8d00146812ff4a8.tar.xz ice-7d2dfaddb94993b1f0cbf3adf8d00146812ff4a8.zip | |
Fixes for C++17 compatibility
Fixes #24
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/Ice/Proxy.h | 16 | ||||
| -rw-r--r-- | cpp/include/IceUtil/Timer.h | 4 |
2 files changed, 20 insertions, 0 deletions
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h index f751060aa4d..feb9f295e5c 100644 --- a/cpp/include/Ice/Proxy.h +++ b/cpp/include/Ice/Proxy.h @@ -1454,7 +1454,11 @@ ICE_API bool proxyIdentityAndFacetEqual(const ::std::shared_ptr<ObjectPrx>& lhs, * compares less than the identity in rhs, false otherwise. * \headerfile Ice/Ice.h */ +#if (__cplusplus >= 201703L) +struct ProxyIdentityLess +#else struct ProxyIdentityLess : std::binary_function<bool, ::std::shared_ptr<ObjectPrx>&, ::std::shared_ptr<ObjectPrx>&> +#endif { bool operator()(const ::std::shared_ptr<ObjectPrx>& lhs, const ::std::shared_ptr<ObjectPrx>& rhs) const { @@ -1467,7 +1471,11 @@ struct ProxyIdentityLess : std::binary_function<bool, ::std::shared_ptr<ObjectPr * compares equal to the identity in rhs, false otherwise. * \headerfile Ice/Ice.h */ +#if (__cplusplus >= 201703L) +struct ProxyIdentityEqual +#else struct ProxyIdentityEqual : std::binary_function<bool, ::std::shared_ptr<ObjectPrx>&, ::std::shared_ptr<ObjectPrx>&> +#endif { bool operator()(const ::std::shared_ptr<ObjectPrx>& lhs, const ::std::shared_ptr<ObjectPrx>& rhs) const { @@ -1480,7 +1488,11 @@ struct ProxyIdentityEqual : std::binary_function<bool, ::std::shared_ptr<ObjectP * and facet in lhs compare less than the identity and facet in rhs, false otherwise. * \headerfile Ice/Ice.h */ +#if (__cplusplus >= 201703L) +struct ProxyIdentityAndFacetLess +#else struct ProxyIdentityAndFacetLess : std::binary_function<bool, ::std::shared_ptr<ObjectPrx>&, ::std::shared_ptr<ObjectPrx>&> +#endif { bool operator()(const ::std::shared_ptr<ObjectPrx>& lhs, const ::std::shared_ptr<ObjectPrx>& rhs) const { @@ -1493,7 +1505,11 @@ struct ProxyIdentityAndFacetLess : std::binary_function<bool, ::std::shared_ptr< * and facet in lhs compare equal to the identity and facet in rhs, false otherwise. * \headerfile Ice/Ice.h */ +#if (__cplusplus >= 201703L) +struct ProxyIdentityAndFacetEqual +#else struct ProxyIdentityAndFacetEqual : std::binary_function<bool, ::std::shared_ptr<ObjectPrx>&, ::std::shared_ptr<ObjectPrx>&> +#endif { bool operator()(const ::std::shared_ptr<ObjectPrx>& lhs, const ::std::shared_ptr<ObjectPrx>& rhs) const { diff --git a/cpp/include/IceUtil/Timer.h b/cpp/include/IceUtil/Timer.h index a89e4e3230d..755315c6839 100644 --- a/cpp/include/IceUtil/Timer.h +++ b/cpp/include/IceUtil/Timer.h @@ -104,7 +104,11 @@ protected: bool _destroyed; std::set<Token> _tokens; +#if (__cplusplus >= 201703L) + class TimerTaskCompare +#else class TimerTaskCompare : public std::binary_function<TimerTaskPtr, TimerTaskPtr, bool> +#endif { public: |