diff options
Diffstat (limited to 'cpp/include/Ice/Object.h')
| -rw-r--r-- | cpp/include/Ice/Object.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h index 4e8273cf7f0..228d75fb296 100644 --- a/cpp/include/Ice/Object.h +++ b/cpp/include/Ice/Object.h @@ -19,7 +19,6 @@ #include <IceUtil/Mutex.h> #include <Ice/ObjectF.h> #include <Ice/ProxyF.h> -#include <Ice/StreamF.h> #include <Ice/IncomingAsyncF.h> #include <Ice/Current.h> @@ -83,15 +82,9 @@ public: static ::std::string __all[]; virtual ::IceInternal::DispatchStatus __dispatch(::IceInternal::Incoming&, const Current&); - virtual void __write(::IceInternal::BasicStream*) const; + virtual void __write(::IceInternal::BasicStream*, bool) const; virtual void __read(::IceInternal::BasicStream*, bool = true); - virtual void __marshal(const ::Ice::StreamPtr&, bool) const; - virtual void __unmarshal(const ::Ice::StreamPtr&); - - void ice_marshal(const ::std::string&, const ::Ice::StreamPtr&); - static void ice_unmarshal(const ::std::string&, const ::Ice::StreamPtr&, ObjectPtr&); - void ice_addFacet(const ObjectPtr&, const ::std::string&); ObjectPtr ice_removeFacet(const ::std::string&); ObjectPtr ice_updateFacet(const ObjectPtr&, const ::std::string&); @@ -107,8 +100,6 @@ private: static const char * const _kindOfObject; }; -void ICE_API __patch__ObjectPtr(void*, ObjectPtr&); - class ICE_API Blobject : virtual public Object { public: |