diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/Ice/SlicedData.h | 2 | ||||
| -rw-r--r-- | cpp/include/Ice/Stream.h | 8 | ||||
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 8 |
3 files changed, 0 insertions, 18 deletions
diff --git a/cpp/include/Ice/SlicedData.h b/cpp/include/Ice/SlicedData.h index d08c4af067f..3e058689d15 100644 --- a/cpp/include/Ice/SlicedData.h +++ b/cpp/include/Ice/SlicedData.h @@ -89,10 +89,8 @@ public: virtual void __write(::IceInternal::BasicStream*) const; virtual void __read(::IceInternal::BasicStream*); -#ifdef __SUNPRO_CC using Object::__write; using Object::__read; -#endif private: diff --git a/cpp/include/Ice/Stream.h b/cpp/include/Ice/Stream.h index 638fb80d705..8dc1a300f8b 100644 --- a/cpp/include/Ice/Stream.h +++ b/cpp/include/Ice/Stream.h @@ -74,20 +74,16 @@ public: virtual bool __usesClasses() const; -#ifdef __SUNPRO_CC using UserException::__read; using UserException::__write; -#endif protected: virtual void __writeImpl(::IceInternal::BasicStream*) const; virtual void __readImpl(::IceInternal::BasicStream*); -#ifdef __SUNPRO_CC using UserException::__writeImpl; using UserException::__readImpl; -#endif const CommunicatorPtr _communicator; }; @@ -434,20 +430,16 @@ public: virtual bool __usesClasses() const; -#ifdef __SUNPRO_CC using UserException::__read; using UserException::__write; -#endif protected: virtual void __writeImpl(::IceInternal::BasicStream*) const; virtual void __readImpl(::IceInternal::BasicStream*); -#ifdef __SUNPRO_CC using UserException::__writeImpl; using UserException::__readImpl; -#endif const CommunicatorPtr _communicator; }; diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 0c7372b7060..b81d26c9c35 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -901,10 +901,8 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p) else { string baseName = base ? fixKwd(base->scoped()) : string("::Ice::UserException"); - H << nl << "#ifdef __SUNPRO_CC"; H << nl << "using " << baseName << "::__write;"; H << nl << "using " << baseName << "::__read;"; - H << nl << "#endif"; } } @@ -923,10 +921,8 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p) else { string baseName = base ? fixKwd(base->scoped()) : string("::Ice::UserException"); - H << nl << "#ifdef __SUNPRO_CC"; H << nl << "using " << baseName << "::__writeImpl;"; H << nl << "using " << baseName << "::__readImpl;"; - H << nl << "#endif"; } if(preserved && !basePreserved) @@ -3103,10 +3099,8 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p) else { string baseName = base ? fixKwd(base->scoped()) : string("::Ice::Object"); - H << nl << "#ifdef __SUNPRO_CC"; H << nl << "using " << baseName << "::__write;"; H << nl << "using " << baseName << "::__read;"; - H << nl << "#endif"; } } @@ -3125,10 +3119,8 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p) else { string baseName = base ? fixKwd(base->scoped()) : string("::Ice::Object"); - H << nl << "#ifdef __SUNPRO_CC"; H << nl << "using " << baseName << "::__writeImpl;"; H << nl << "using " << baseName << "::__readImpl;"; - H << nl << "#endif"; } if(preserved && !basePreserved) |