diff options
Diffstat (limited to 'cpp/include/IceUtil/Config.h')
| -rw-r--r-- | cpp/include/IceUtil/Config.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index d9224d94b4e..7aaf06fc728 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -264,13 +264,13 @@ typedef long long Int64; # define ICE_NULLPTR nullptr # define ICE_DYNAMIC_CAST(T,V) ::std::dynamic_pointer_cast<T>(V) # define ICE_SHARED_FROM_THIS shared_from_this() -# define ICE_CHECKED_CAST(T,V) Ice::checkedCast<T>(V) -# define ICE_UNCHECKED_CAST(T,V) Ice::uncheckedCast<T>(V) -# define ICE_VALUE_FACTORY ::std::function<::std::shared_ptr<::Ice::Value> (const std::string& type)> -# define ICE_CLOSE_CALLBACK ::std::function<void (::std::shared_ptr<::Ice::Connection>)> -# define ICE_HEARTBEAT_CALLBACK ::std::function<void (::std::shared_ptr<::Ice::Connection>)> +# define ICE_CHECKED_CAST(T, ...) Ice::checkedCast<T>(__VA_ARGS__) +# define ICE_UNCHECKED_CAST(T, ...) Ice::uncheckedCast<T>(__VA_ARGS__) +# define ICE_VALUE_FACTORY ::std::function<::std::shared_ptr<::Ice::Value> (const std::string&)> +# define ICE_CLOSE_CALLBACK ::std::function<void (const ::std::shared_ptr<::Ice::Connection>&)> +# define ICE_HEARTBEAT_CALLBACK ::std::function<void (const ::std::shared_ptr<::Ice::Connection>&)> # define ICE_IN(T) T -# define ICE_EXCEPTION_GET(T) T +# define ICE_EXCEPTION_ISSET(T) T # define ICE_RETHROW_EXCEPTION(T) ::std::rethrow_exception(T) # define ICE_RESET_EXCEPTION(T, V) T = V #else // C++98 mapping @@ -283,13 +283,13 @@ typedef long long Int64; # define ICE_NULLPTR 0 # define ICE_DYNAMIC_CAST(T,V) T##Ptr::dynamicCast(V) # define ICE_SHARED_FROM_THIS this -# define ICE_CHECKED_CAST(T,V) T::checkedCast(V) -# define ICE_UNCHECKED_CAST(T,V) T::uncheckedCast(V) +# define ICE_CHECKED_CAST(T, ...) T::checkedCast(__VA_ARGS__) +# define ICE_UNCHECKED_CAST(T, ...) T::uncheckedCast(__VA_ARGS__) # define ICE_VALUE_FACTORY ::Ice::ValueFactoryPtr # define ICE_CLOSE_CALLBACK ::Ice::CloseCallbackPtr # define ICE_HEARTBEAT_CALLBACK ::Ice::HeartbeatCallbackPtr # define ICE_IN(T) const T& -# define ICE_EXCEPTION_GET(T) T.get() +# define ICE_EXCEPTION_ISSET(T) (T.get() != 0) # define ICE_RETHROW_EXCEPTION(T) T->ice_throw() # define ICE_RESET_EXCEPTION(T,V) T.reset(V) #endif |