diff options
Diffstat (limited to 'cpp/include/Ice/Value.h')
| -rw-r--r-- | cpp/include/Ice/Value.h | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/cpp/include/Ice/Value.h b/cpp/include/Ice/Value.h index 3a242168229..d348b0e01e5 100644 --- a/cpp/include/Ice/Value.h +++ b/cpp/include/Ice/Value.h @@ -13,18 +13,13 @@ #ifdef ICE_CPP11_MAPPING // C++11 mapping #include <Ice/ValueF.h> -#include <Ice/StreamF.h> - -namespace IceInternal -{ - -class BasicStream; - -} namespace Ice { +class OutputStream; +class InputStream; + class ICE_API Value { public: @@ -34,8 +29,8 @@ public: virtual void ice_preMarshal(); virtual void ice_postUnmarshal(); - virtual void __write(IceInternal::BasicStream*) const; - virtual void __read(IceInternal::BasicStream*); + virtual void __write(Ice::OutputStream*) const; + virtual void __read(Ice::InputStream*); virtual const std::string& ice_id() const; static const std::string& ice_staticId(); @@ -46,8 +41,8 @@ protected: virtual std::shared_ptr<Value> cloneImpl() const = 0; - virtual void __writeImpl(IceInternal::BasicStream*) const {} - virtual void __readImpl(IceInternal::BasicStream*) {} + virtual void __writeImpl(Ice::OutputStream*) const {} + virtual void __readImpl(Ice::InputStream*) {} }; template<typename T, typename Base> class ValueHelper : public Base @@ -76,9 +71,6 @@ protected: } }; -ICE_API void ice_writeObject(const OutputStreamPtr&, const std::shared_ptr<Value>&); -ICE_API void ice_readObject(const InputStreamPtr&, std::shared_ptr<Value>&); - } #endif // C++11 mapping end |