diff options
| author | Mark Spruiell <mes@zeroc.com> | 2012-09-24 16:00:56 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2012-09-24 16:00:56 -0700 |
| commit | 6bb0a7b82684d1ce59a996848773054ede1f442e (patch) | |
| tree | 9a9cfbaa225afd5caca819eea9558908c9a64a40 /cpp/include | |
| parent | Replaced optionalType in StreamTrait<> by a bool fixedLength member (diff) | |
| download | ice-6bb0a7b82684d1ce59a996848773054ede1f442e.tar.bz2 ice-6bb0a7b82684d1ce59a996848773054ede1f442e.tar.xz ice-6bb0a7b82684d1ce59a996848773054ede1f442e.zip | |
Ruby port; Python & C++ fixes
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/Ice/Stream.h | 12 | ||||
| -rw-r--r-- | cpp/include/Ice/StreamTraits.h | 1 |
2 files changed, 0 insertions, 13 deletions
diff --git a/cpp/include/Ice/Stream.h b/cpp/include/Ice/Stream.h index 9dda1497006..68213ec008b 100644 --- a/cpp/include/Ice/Stream.h +++ b/cpp/include/Ice/Stream.h @@ -63,8 +63,6 @@ public: ~UserExceptionReader() throw(); virtual void read(const InputStreamPtr&) const = 0; - virtual bool usesClasses() const = 0; - virtual void usesClasses(bool) = 0; virtual ::std::string ice_name() const = 0; virtual UserException* ice_clone() const = 0; @@ -73,9 +71,6 @@ public: virtual void __write(IceInternal::BasicStream*) const; virtual void __read(IceInternal::BasicStream*); - virtual bool __usesClasses() const; - virtual void __usesClasses(bool); - protected: const CommunicatorPtr _communicator; @@ -394,7 +389,6 @@ public: ~UserExceptionWriter() throw(); virtual void write(const OutputStreamPtr&) const = 0; - virtual bool usesClasses() const = 0; virtual ::std::string ice_name() const = 0; virtual UserException* ice_clone() const = 0; @@ -403,12 +397,6 @@ public: virtual void __write(IceInternal::BasicStream*) const; virtual void __read(IceInternal::BasicStream*); - virtual bool __usesClasses() const; - -#ifdef __SUNPRO_CC - using UserException::__usesClasses; -#endif - protected: const CommunicatorPtr _communicator; diff --git a/cpp/include/Ice/StreamTraits.h b/cpp/include/Ice/StreamTraits.h index 2316964d782..8dfce94a0b1 100644 --- a/cpp/include/Ice/StreamTraits.h +++ b/cpp/include/Ice/StreamTraits.h @@ -116,7 +116,6 @@ struct StreamTrait static const bool fixedLength = false; }; - // // StreamTrait specialization for array / range mapped sequences // The type can be a std::pair<T, T> or a |