summaryrefslogtreecommitdiff
path: root/cpp/include/Ice/OutgoingAsync.h
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/include/Ice/OutgoingAsync.h')
-rw-r--r--cpp/include/Ice/OutgoingAsync.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h
index 23d2ef8a1e6..8391c6c189d 100644
--- a/cpp/include/Ice/OutgoingAsync.h
+++ b/cpp/include/Ice/OutgoingAsync.h
@@ -101,12 +101,12 @@ public:
virtual void throwLocalException() const;
- virtual bool iceWait();
- virtual Ice::InputStream* iceStartReadParams();
- virtual void iceEndReadParams();
- virtual void iceReadEmptyParams();
- virtual void iceReadParamEncaps(const ::Ice::Byte*&, ::Ice::Int&);
- virtual void iceThrowUserException();
+ virtual bool __wait();
+ virtual Ice::InputStream* __startReadParams();
+ virtual void __endReadParams();
+ virtual void __readEmptyParams();
+ virtual void __readParamEncaps(const ::Ice::Byte*&, ::Ice::Int&);
+ virtual void __throwUserException();
#endif
void attachRemoteObserver(const Ice::ConnectionInfoPtr& c, const Ice::EndpointPtr& endpt, Ice::Int requestId)
@@ -753,7 +753,7 @@ public:
//
// See comments in OutgoingAsync.cpp
//
-extern ICE_API CallbackBasePtr dummyCallback;
+extern ICE_API CallbackBasePtr __dummyCallback;
//
// Generic callback template that requires the caller to down-cast the