diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/Ice/Object.h | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/Object.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h index 565822b7f86..48257379fef 100644 --- a/cpp/include/Ice/Object.h +++ b/cpp/include/Ice/Object.h @@ -83,8 +83,6 @@ public: static const std::string& ice_staticId(); - virtual ObjectPtr ice_clone() const; - static std::string __all[]; virtual DispatchStatus ice_dispatch(Ice::Request&, const DispatchInterceptorAsyncCallbackPtr& = 0); diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index f31669f9c85..f20b22deded 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -86,12 +86,14 @@ Ice::Object::ice_staticId() return __Ice__Object_ids[0]; } +#ifndef ICE_CPP11_MAPPING Ice::ObjectPtr Ice::Object::ice_clone() const { throw CloneNotImplementedException(__FILE__, __LINE__); return 0; // avoid warning with some compilers } +#endif DispatchStatus Ice::Object::___ice_isA(Incoming& __inS, const Current& __current) |