diff options
Diffstat (limited to 'cpp/include/Ice/Object.h')
| -rw-r--r-- | cpp/include/Ice/Object.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h index b01a469f060..23291abdad3 100644 --- a/cpp/include/Ice/Object.h +++ b/cpp/include/Ice/Object.h @@ -61,12 +61,12 @@ public: bool operator==(const Object&) const; bool operator<(const Object&) const; - ::Ice::Int _hash() const; + ::Ice::Int _ice_hash() const; - virtual bool _isA(const std::string&); - virtual void _ping(); - ::IceInternal::DispatchStatus ____isA(::IceInternal::Incoming&); - ::IceInternal::DispatchStatus ____ping(::IceInternal::Incoming&); + virtual bool _ice_isA(const std::string&); + virtual void _ice_ping(); + ::IceInternal::DispatchStatus ____ice_isA(::IceInternal::Incoming&); + ::IceInternal::DispatchStatus ____ice_ping(::IceInternal::Incoming&); virtual const char** __getClassIds() = 0; static const char* __all[]; @@ -76,10 +76,10 @@ public: virtual void __write(::IceInternal::BasicStream*) const; virtual void __read(::IceInternal::BasicStream*); - void _addFacet(const ObjectPtr&, const ::std::string&); - void _removeFacet(const ::std::string&); - void _removeAllFacets(); - ObjectPtr _findFacet(const ::std::string&); + void _ice_addFacet(const ObjectPtr&, const ::std::string&); + void _ice_removeFacet(const ::std::string&); + void _ice_removeAllFacets(); + ObjectPtr _ice_findFacet(const ::std::string&); private: |