summaryrefslogtreecommitdiff
path: root/cpp/include
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/include')
-rw-r--r--cpp/include/Ice/AsyncResult.h20
-rw-r--r--cpp/include/Ice/CommunicatorAsync.h20
-rw-r--r--cpp/include/Ice/ConnectionAsync.h20
-rw-r--r--cpp/include/Ice/DispatchInterceptor.h2
-rw-r--r--cpp/include/Ice/Exception.h10
-rw-r--r--cpp/include/Ice/ExceptionHelpers.h8
-rw-r--r--cpp/include/Ice/GCObject.h6
-rw-r--r--cpp/include/Ice/Handle.h5
-rw-r--r--cpp/include/Ice/Incoming.h4
-rw-r--r--cpp/include/Ice/InputStream.h6
-rw-r--r--cpp/include/Ice/LoggerUtil.h12
-rw-r--r--cpp/include/Ice/Object.h46
-rw-r--r--cpp/include/Ice/ObjectF.h2
-rw-r--r--cpp/include/Ice/OutgoingAsync.h14
-rw-r--r--cpp/include/Ice/Proxy.h464
-rw-r--r--cpp/include/Ice/ProxyHandle.h2
-rw-r--r--cpp/include/Ice/SlicedData.h12
-rw-r--r--cpp/include/Ice/Value.h16
18 files changed, 330 insertions, 339 deletions
diff --git a/cpp/include/Ice/AsyncResult.h b/cpp/include/Ice/AsyncResult.h
index e8aea029007..e2c1d53d53b 100644
--- a/cpp/include/Ice/AsyncResult.h
+++ b/cpp/include/Ice/AsyncResult.h
@@ -51,20 +51,20 @@ public:
virtual const std::string& getOperation() const = 0;
- virtual bool __wait() = 0;
- virtual Ice::InputStream* __startReadParams() = 0;
- virtual void __endReadParams() = 0;
- virtual void __readEmptyParams() = 0;
- virtual void __readParamEncaps(const ::Ice::Byte*&, ::Ice::Int&) = 0;
- virtual void __throwUserException() = 0;
+ virtual bool waitForResponse() = 0;
+ virtual Ice::InputStream* startReadParams() = 0;
+ virtual void endReadParams() = 0;
+ virtual void readEmptyParams() = 0;
+ virtual void readParamEncaps(const ::Ice::Byte*&, ::Ice::Int&) = 0;
+ virtual void throwUserException() = 0;
- static void __check(const AsyncResultPtr&, const ::IceProxy::Ice::Object*, const ::std::string&);
- static void __check(const AsyncResultPtr&, const Connection*, const ::std::string&);
- static void __check(const AsyncResultPtr&, const Communicator*, const ::std::string&);
+ static void check(const AsyncResultPtr&, const ::IceProxy::Ice::Object*, const ::std::string&);
+ static void check(const AsyncResultPtr&, const Connection*, const ::std::string&);
+ static void check(const AsyncResultPtr&, const Communicator*, const ::std::string&);
protected:
- static void __check(const AsyncResultPtr&, const ::std::string&);
+ static void check(const AsyncResultPtr&, const ::std::string&);
};
}
diff --git a/cpp/include/Ice/CommunicatorAsync.h b/cpp/include/Ice/CommunicatorAsync.h
index 549542567dd..5dfdadd44aa 100644
--- a/cpp/include/Ice/CommunicatorAsync.h
+++ b/cpp/include/Ice/CommunicatorAsync.h
@@ -33,18 +33,18 @@ public:
{
}
- virtual void completed(const ::Ice::AsyncResultPtr& __result) const
+ virtual void completed(const ::Ice::AsyncResultPtr& result) const
{
- ::Ice::CommunicatorPtr __com = __result->getCommunicator();
- assert(__com);
+ ::Ice::CommunicatorPtr communicator = result->getCommunicator();
+ assert(communicator);
try
{
- __com->end_flushBatchRequests(__result);
+ communicator->end_flushBatchRequests(result);
assert(false);
}
catch(const ::Ice::Exception& ex)
{
- ::IceInternal::CallbackNC<T>::exception(__result, ex);
+ ::IceInternal::CallbackNC<T>::exception(result, ex);
}
}
};
@@ -81,18 +81,18 @@ public:
{
}
- virtual void completed(const ::Ice::AsyncResultPtr& __result) const
+ virtual void completed(const ::Ice::AsyncResultPtr& result) const
{
- ::Ice::CommunicatorPtr __com = __result->getCommunicator();
- assert(__com);
+ ::Ice::CommunicatorPtr communicator = result->getCommunicator();
+ assert(communicator);
try
{
- __com->end_flushBatchRequests(__result);
+ communicator->end_flushBatchRequests(result);
assert(false);
}
catch(const ::Ice::Exception& ex)
{
- ::IceInternal::Callback<T, CT>::exception(__result, ex);
+ ::IceInternal::Callback<T, CT>::exception(result, ex);
}
}
};
diff --git a/cpp/include/Ice/ConnectionAsync.h b/cpp/include/Ice/ConnectionAsync.h
index ce9fd85e7af..bc3f6064525 100644
--- a/cpp/include/Ice/ConnectionAsync.h
+++ b/cpp/include/Ice/ConnectionAsync.h
@@ -34,18 +34,18 @@ public:
{
}
- virtual void completed(const ::Ice::AsyncResultPtr& __result) const
+ virtual void completed(const ::Ice::AsyncResultPtr& result) const
{
- ::Ice::ConnectionPtr __con = __result->getConnection();
- assert(__con);
+ ::Ice::ConnectionPtr connection = result->getConnection();
+ assert(connection);
try
{
- __con->end_flushBatchRequests(__result);
+ connection->end_flushBatchRequests(result);
assert(false);
}
catch(const ::Ice::Exception& ex)
{
- ::IceInternal::CallbackNC<T>::exception(__result, ex);
+ ::IceInternal::CallbackNC<T>::exception(result, ex);
}
}
};
@@ -81,18 +81,18 @@ public:
{
}
- virtual void completed(const ::Ice::AsyncResultPtr& __result) const
+ virtual void completed(const ::Ice::AsyncResultPtr& result) const
{
- ::Ice::ConnectionPtr __con = __result->getConnection();
- assert(__con);
+ ::Ice::ConnectionPtr connection = result->getConnection();
+ assert(connection);
try
{
- __con->end_flushBatchRequests(__result);
+ connection->end_flushBatchRequests(result);
assert(false);
}
catch(const ::Ice::Exception& ex)
{
- ::IceInternal::Callback<T, CT>::exception(__result, ex);
+ ::IceInternal::Callback<T, CT>::exception(result, ex);
}
}
};
diff --git a/cpp/include/Ice/DispatchInterceptor.h b/cpp/include/Ice/DispatchInterceptor.h
index 648e21412ca..aca5b713aaf 100644
--- a/cpp/include/Ice/DispatchInterceptor.h
+++ b/cpp/include/Ice/DispatchInterceptor.h
@@ -21,7 +21,7 @@ public:
virtual bool dispatch(Request&) = 0;
- virtual bool __dispatch(IceInternal::Incoming&, const Current&);
+ virtual bool _iceDispatch(IceInternal::Incoming&, const Current&);
};
ICE_DEFINE_PTR(DispatchInterceptorPtr, DispatchInterceptor);
diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h
index b2b4720b8ea..ee38d00688d 100644
--- a/cpp/include/Ice/Exception.h
+++ b/cpp/include/Ice/Exception.h
@@ -57,10 +57,10 @@ class ICE_API UserException : public IceUtil::Exception
{
public:
- virtual void __write(::Ice::OutputStream*) const;
- virtual void __read(::Ice::InputStream*);
+ virtual void _write(::Ice::OutputStream*) const;
+ virtual void _read(::Ice::InputStream*);
- virtual bool __usesClasses() const;
+ virtual bool _usesClasses() const;
#ifdef ICE_CPP11_MAPPING
std::unique_ptr<UserException> ice_clone() const;
@@ -72,8 +72,8 @@ public:
protected:
- virtual void __writeImpl(::Ice::OutputStream*) const {};
- virtual void __readImpl(::Ice::InputStream*) {};
+ virtual void _writeImpl(::Ice::OutputStream*) const {};
+ virtual void _readImpl(::Ice::InputStream*) {};
};
diff --git a/cpp/include/Ice/ExceptionHelpers.h b/cpp/include/Ice/ExceptionHelpers.h
index 04c37669f07..28efc9c9060 100644
--- a/cpp/include/Ice/ExceptionHelpers.h
+++ b/cpp/include/Ice/ExceptionHelpers.h
@@ -45,20 +45,20 @@ public:
protected:
- virtual void __writeImpl(Ice::OutputStream* os) const override
+ virtual void _writeImpl(Ice::OutputStream* os) const override
{
os->startSlice(T::ice_staticId(), -1, std::is_same<B, Ice::LocalException>::value ? true : false);
Ice::StreamWriter<T, Ice::OutputStream>::write(os, static_cast<const T&>(*this));
os->endSlice();
- B::__writeImpl(os);
+ B::_writeImpl(os);
}
- virtual void __readImpl(Ice::InputStream* is) override
+ virtual void _readImpl(Ice::InputStream* is) override
{
is->startSlice();
Ice::StreamReader<T, ::Ice::InputStream>::read(is, static_cast<T&>(*this));
is->endSlice();
- B::__readImpl(is);
+ B::_readImpl(is);
}
};
diff --git a/cpp/include/Ice/GCObject.h b/cpp/include/Ice/GCObject.h
index e115795be20..171e12c3cca 100644
--- a/cpp/include/Ice/GCObject.h
+++ b/cpp/include/Ice/GCObject.h
@@ -55,16 +55,16 @@ public:
//
// Override Object methods
//
- virtual bool __gcVisit(GCVisitor&);
+ virtual bool _iceGcVisit(GCVisitor&);
virtual void ice_collectable(bool);
//
// This method is implemented by Slice classes to visit class
// members.
//
- virtual void __gcVisitMembers(IceInternal::GCVisitor&) = 0;
+ virtual void _iceGcVisitMembers(IceInternal::GCVisitor&) = 0;
- int __getRefUnsafe()
+ int _iceGetRefUnsafe()
{
return _ref;
}
diff --git a/cpp/include/Ice/Handle.h b/cpp/include/Ice/Handle.h
index 59283f07702..fc3ad32a833 100644
--- a/cpp/include/Ice/Handle.h
+++ b/cpp/include/Ice/Handle.h
@@ -180,11 +180,6 @@ public:
{
return Handle(dynamic_cast<T*>(p));
}
-
- void __clearHandleUnsafe()
- {
- this->_ptr = 0;
- }
};
}
diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h
index f512d38ac8b..ba3b1977aaa 100644
--- a/cpp/include/Ice/Incoming.h
+++ b/cpp/include/Ice/Incoming.h
@@ -37,12 +37,12 @@ public:
std::shared_ptr<OutputStream> getOutputStream() const
{
- return __os;
+ return ostr;
}
protected:
- std::shared_ptr<OutputStream> __os;
+ std::shared_ptr<OutputStream> ostr;
};
}
diff --git a/cpp/include/Ice/InputStream.h b/cpp/include/Ice/InputStream.h
index 81d5be4c950..552289a69f4 100644
--- a/cpp/include/Ice/InputStream.h
+++ b/cpp/include/Ice/InputStream.h
@@ -41,7 +41,7 @@ patchHandle(void* addr, const ValuePtr& v)
}
#else
IceInternal::Handle<T>* p = static_cast<IceInternal::Handle<T>*>(addr);
- __patch(*p, v); // Generated __patch method, necessary for forward declarations.
+ _icePatchObjectPtr(*p, v); // Generated _icePatchObjectPtr function, necessary for forward declarations.
#endif
}
@@ -594,14 +594,14 @@ public:
else
{
v = ::IceInternal::createProxy<T>();
- v->__copyFrom(proxy);
+ v->_copyFrom(proxy);
}
}
#else
void read(ObjectPrx&);
template<typename T> void read(IceInternal::ProxyHandle<T>& v)
{
- __read(this, v); // Generated __read method, necessary for forward declarations.
+ _readProxy(this, v); // Generated _readProxy method, necessary for forward declarations.
}
#endif
diff --git a/cpp/include/Ice/LoggerUtil.h b/cpp/include/Ice/LoggerUtil.h
index ff890e9aedd..8352e72c2e6 100644
--- a/cpp/include/Ice/LoggerUtil.h
+++ b/cpp/include/Ice/LoggerUtil.h
@@ -24,11 +24,11 @@ public:
std::string str() const;
- std::ostringstream& __str(); // For internal use only. Don't use in your code.
+ std::ostringstream& _stream(); // For internal use only. Don't use in your code.
private:
- std::ostringstream _str;
+ std::ostringstream _os;
};
ICE_API LoggerOutputBase& loggerInsert(LoggerOutputBase& out, const IceUtil::Exception& ex);
@@ -48,7 +48,7 @@ struct LoggerOutputInserter
static inline LoggerOutputBase&
insert(LoggerOutputBase& out, const T& val)
{
- out.__str() << val;
+ out._stream() << val;
return out;
}
};
@@ -87,7 +87,7 @@ operator<<(LoggerOutputBase& os, const ::IceInternal::ProxyHandle<T>& p)
inline LoggerOutputBase&
operator<<(LoggerOutputBase& out, const ::std::exception& ex)
{
- out.__str() << ex.what();
+ out._stream() << ex.what();
return out;
}
@@ -108,13 +108,13 @@ public:
inline void flush()
{
- std::string s = __str().str();
+ std::string s = _stream().str();
if(!s.empty())
{
L& ref = *_logger;
(ref.*output)(s);
}
- __str().str("");
+ _stream().str("");
}
private:
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h
index 6e472bd5fee..c468513cd52 100644
--- a/cpp/include/Ice/Object.h
+++ b/cpp/include/Ice/Object.h
@@ -70,21 +70,19 @@ public:
virtual ~Object() = default;
virtual bool ice_isA(std::string, const Current& = Ice::noExplicitCurrent) const;
- bool ___ice_isA(IceInternal::Incoming&, const Current&);
+ bool _iceD_ice_isA(IceInternal::Incoming&, const Current&);
virtual void ice_ping(const Current& = Ice::noExplicitCurrent) const;
- bool ___ice_ping(IceInternal::Incoming&, const Current&);
+ bool _iceD_ice_ping(IceInternal::Incoming&, const Current&);
virtual std::vector< std::string> ice_ids(const Current& = Ice::noExplicitCurrent) const;
- bool ___ice_ids(IceInternal::Incoming&, const Current&);
+ bool _iceD_ice_ids(IceInternal::Incoming&, const Current&);
virtual std::string ice_id(const Current& = Ice::noExplicitCurrent) const;
- bool ___ice_id(IceInternal::Incoming&, const Current&);
+ bool _iceD_ice_id(IceInternal::Incoming&, const Current&);
static const std::string& ice_staticId();
- static std::string __all[];
-
#ifndef ICE_CPP11_MAPPING
virtual bool ice_dispatch(Ice::Request&, const DispatchInterceptorAsyncCallbackPtr& = 0);
#else
@@ -92,7 +90,7 @@ public:
std::function<bool()> = nullptr,
std::function<bool(std::exception_ptr)> = nullptr);
#endif
- virtual bool __dispatch(IceInternal::Incoming&, const Current&);
+ virtual bool _iceDispatch(IceInternal::Incoming&, const Current&);
struct Ice_invokeResult
{
@@ -102,7 +100,7 @@ public:
protected:
- static void __checkMode(OperationMode, OperationMode);
+ static void _iceCheckMode(OperationMode, OperationMode);
};
#else
class ICE_API Object : public virtual IceUtil::Shared
@@ -113,23 +111,23 @@ public:
virtual bool operator<(const Object&) const;
virtual bool ice_isA(const std::string&, const Current& = Ice::noExplicitCurrent) const;
- bool ___ice_isA(IceInternal::Incoming&, const Current&);
+ bool _iceD_ice_isA(IceInternal::Incoming&, const Current&);
virtual void ice_ping(const Current& = Ice::noExplicitCurrent) const;
- bool ___ice_ping(IceInternal::Incoming&, const Current&);
+ bool _iceD_ice_ping(IceInternal::Incoming&, const Current&);
virtual std::vector< std::string> ice_ids(const Current& = Ice::noExplicitCurrent) const;
- bool ___ice_ids(IceInternal::Incoming&, const Current&);
+ bool _iceD_ice_ids(IceInternal::Incoming&, const Current&);
virtual const std::string& ice_id(const Current& = Ice::noExplicitCurrent) const;
- bool ___ice_id(IceInternal::Incoming&, const Current&);
+ bool _iceD_ice_id(IceInternal::Incoming&, const Current&);
virtual Int ice_operationAttributes(const std::string&) const;
- virtual void __write(Ice::OutputStream*) const;
- virtual void __read(Ice::InputStream*);
+ virtual void _iceWrite(Ice::OutputStream*) const;
+ virtual void _iceRead(Ice::InputStream*);
- virtual bool __gcVisit(IceInternal::GCVisitor&) { return false; };
+ virtual bool _iceGcVisit(IceInternal::GCVisitor&) { return false; };
virtual void ice_collectable(bool) { };
virtual void ice_preMarshal();
@@ -139,10 +137,8 @@ public:
virtual ObjectPtr ice_clone() const;
- static std::string __all[];
-
virtual bool ice_dispatch(Ice::Request&, const DispatchInterceptorAsyncCallbackPtr& = 0);
- virtual bool __dispatch(IceInternal::Incoming&, const Current&);
+ virtual bool _iceDispatch(IceInternal::Incoming&, const Current&);
protected:
@@ -151,10 +147,10 @@ protected:
protected:
- virtual void __writeImpl(Ice::OutputStream*) const {}
- virtual void __readImpl(Ice::InputStream*) {}
+ virtual void _iceWriteImpl(Ice::OutputStream*) const {}
+ virtual void _iceReadImpl(Ice::InputStream*) {}
- static void __checkMode(OperationMode, OperationMode);
+ static void _iceCheckMode(OperationMode, OperationMode);
};
#endif
@@ -167,7 +163,7 @@ public:
//
virtual bool ice_invoke(const std::vector<Byte>&, std::vector<Byte>&, const Current&) = 0;
- virtual bool __dispatch(IceInternal::Incoming&, const Current&);
+ virtual bool _iceDispatch(IceInternal::Incoming&, const Current&);
};
class ICE_API BlobjectArray : public virtual Object
@@ -179,7 +175,7 @@ public:
//
virtual bool ice_invoke(const std::pair<const Byte*, const Byte*>&, std::vector<Byte>&, const Current&) = 0;
- virtual bool __dispatch(IceInternal::Incoming&, const Current&);
+ virtual bool _iceDispatch(IceInternal::Incoming&, const Current&);
};
class ICE_API BlobjectAsync : public virtual Object
@@ -194,7 +190,7 @@ public:
#else
virtual void ice_invoke_async(const AMD_Object_ice_invokePtr&, const std::vector<Byte>&, const Current&) = 0;
#endif
- virtual bool __dispatch(IceInternal::Incoming&, const Current&);
+ virtual bool _iceDispatch(IceInternal::Incoming&, const Current&);
};
class ICE_API BlobjectArrayAsync : public virtual Object
@@ -210,7 +206,7 @@ public:
virtual void ice_invoke_async(const AMD_Object_ice_invokePtr&, const std::pair<const Byte*, const Byte*>&,
const Current&) = 0;
#endif
- virtual bool __dispatch(IceInternal::Incoming&, const Current&);
+ virtual bool _iceDispatch(IceInternal::Incoming&, const Current&);
};
}
diff --git a/cpp/include/Ice/ObjectF.h b/cpp/include/Ice/ObjectF.h
index eb157fac899..577e1faaf04 100644
--- a/cpp/include/Ice/ObjectF.h
+++ b/cpp/include/Ice/ObjectF.h
@@ -23,7 +23,7 @@ using ObjectPtr = ::std::shared_ptr<Object>;
ICE_API Object* upCast(Object*);
typedef IceInternal::Handle<Object> ObjectPtr;
typedef ObjectPtr ValuePtr;
-ICE_API void __patch(ObjectPtr&, const ObjectPtr&);
+ICE_API void _icePatchObjectPtr(ObjectPtr&, const ObjectPtr&);
#endif
}
diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h
index 8391c6c189d..86d017dbfe1 100644
--- a/cpp/include/Ice/OutgoingAsync.h
+++ b/cpp/include/Ice/OutgoingAsync.h
@@ -101,12 +101,12 @@ public:
virtual void throwLocalException() const;
- virtual bool __wait();
- virtual Ice::InputStream* __startReadParams();
- virtual void __endReadParams();
- virtual void __readEmptyParams();
- virtual void __readParamEncaps(const ::Ice::Byte*&, ::Ice::Int&);
- virtual void __throwUserException();
+ virtual bool waitForResponse();
+ 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
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index 30315e7f33b..e996c1324ab 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -73,7 +73,7 @@ public:
invoke(const std::string& operation,
Ice::OperationMode mode,
const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>& inParams,
- const Ice::Context& ctx)
+ const Ice::Context& context)
{
_read = [](bool ok, Ice::InputStream* stream)
{
@@ -85,7 +85,7 @@ public:
try
{
- prepare(operation, mode, ctx);
+ prepare(operation, mode, context);
if(inParams.first == inParams.second)
{
_os.writeEmptyEncapsulation(_encoding);
@@ -252,9 +252,9 @@ public:
::std::string ice_toString() const;
bool
- ice_isA(const ::std::string& typeId, const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ ice_isA(const ::std::string& typeId, const ::Ice::Context& context = ::Ice::noExplicitContext)
{
- return makePromiseOutgoing<bool>(true, this, &ObjectPrx::__ice_isA, typeId, ctx).get();
+ return _makePromiseOutgoing<bool>(true, this, &ObjectPrx::_iceI_isA, typeId, context).get();
}
::std::function<void()>
@@ -262,95 +262,95 @@ public:
::std::function<void(bool)> response,
::std::function<void(::std::exception_ptr)> ex = nullptr,
::std::function<void(bool)> sent = nullptr,
- const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ const ::Ice::Context& context = ::Ice::noExplicitContext)
{
- return makeLambdaOutgoing<bool>(response, ex, sent, this, &ObjectPrx::__ice_isA, typeId, ctx);
+ return _makeLamdaOutgoing<bool>(response, ex, sent, this, &ObjectPrx::_iceI_isA, typeId, context);
}
template<template<typename> class P = std::promise> auto
- ice_isAAsync(const ::std::string& typeId, const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ ice_isAAsync(const ::std::string& typeId, const ::Ice::Context& context = ::Ice::noExplicitContext)
-> decltype(std::declval<P<bool>>().get_future())
{
- return makePromiseOutgoing<bool, P>(false, this, &ObjectPrx::__ice_isA, typeId, ctx);
+ return _makePromiseOutgoing<bool, P>(false, this, &ObjectPrx::_iceI_isA, typeId, context);
}
void
- __ice_isA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<bool>>&, const ::std::string&, const ::Ice::Context&);
+ _iceI_isA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<bool>>&, const ::std::string&, const ::Ice::Context&);
void
- ice_ping(const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ ice_ping(const ::Ice::Context& context = ::Ice::noExplicitContext)
{
- makePromiseOutgoing<void>(true, this, &ObjectPrx::__ice_ping, ctx).get();
+ _makePromiseOutgoing<void>(true, this, &ObjectPrx::_iceI_ping, context).get();
}
::std::function<void()>
ice_pingAsync(::std::function<void()> response,
::std::function<void(::std::exception_ptr)> ex = nullptr,
::std::function<void(bool)> sent = nullptr,
- const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ const ::Ice::Context& context = ::Ice::noExplicitContext)
{
- return makeLambdaOutgoing<void>(response, ex, sent, this, &ObjectPrx::__ice_ping, ctx);
+ return _makeLamdaOutgoing<void>(response, ex, sent, this, &ObjectPrx::_iceI_ping, context);
}
template<template<typename> class P = std::promise>
- auto ice_pingAsync(const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ auto ice_pingAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)
-> decltype(std::declval<P<void>>().get_future())
{
- return makePromiseOutgoing<void, P>(false, this, &ObjectPrx::__ice_ping, ctx);
+ return _makePromiseOutgoing<void, P>(false, this, &ObjectPrx::_iceI_ping, context);
}
void
- __ice_ping(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>&, const ::Ice::Context&);
+ _iceI_ping(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>&, const ::Ice::Context&);
::std::vector<::std::string>
- ice_ids(const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ ice_ids(const ::Ice::Context& context = ::Ice::noExplicitContext)
{
- return makePromiseOutgoing<::std::vector<::std::string>>(true, this, &ObjectPrx::__ice_ids, ctx).get();
+ return _makePromiseOutgoing<::std::vector<::std::string>>(true, this, &ObjectPrx::_iceI_ids, context).get();
}
::std::function<void()>
ice_idsAsync(::std::function<void(::std::vector<::std::string>)> response,
::std::function<void(::std::exception_ptr)> ex = nullptr,
::std::function<void(bool)> sent = nullptr,
- const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ const ::Ice::Context& context = ::Ice::noExplicitContext)
{
- return makeLambdaOutgoing<::std::vector<::std::string>>(response, ex, sent, this, &ObjectPrx::__ice_ids, ctx);
+ return _makeLamdaOutgoing<::std::vector<::std::string>>(response, ex, sent, this, &ObjectPrx::_iceI_ids, context);
}
template<template<typename> class P = std::promise> auto
- ice_idsAsync(const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ ice_idsAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)
-> decltype(std::declval<P<::std::vector<::std::string>>>().get_future())
{
- return makePromiseOutgoing<::std::vector<::std::string>, P>(false, this, &ObjectPrx::__ice_ids, ctx);
+ return _makePromiseOutgoing<::std::vector<::std::string>, P>(false, this, &ObjectPrx::_iceI_ids, context);
}
void
- __ice_ids(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::vector<::std::string>>>&, const ::Ice::Context&);
+ _iceI_ids(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::vector<::std::string>>>&, const ::Ice::Context&);
::std::string
- ice_id(const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ ice_id(const ::Ice::Context& context = ::Ice::noExplicitContext)
{
- return makePromiseOutgoing<::std::string>(true, this, &ObjectPrx::__ice_id, ctx).get();
+ return _makePromiseOutgoing<::std::string>(true, this, &ObjectPrx::_iceI_id, context).get();
}
::std::function<void()>
ice_idAsync(::std::function<void(::std::string)> response,
::std::function<void(::std::exception_ptr)> ex = nullptr,
::std::function<void(bool)> sent = nullptr,
- const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ const ::Ice::Context& context = ::Ice::noExplicitContext)
{
- return makeLambdaOutgoing<::std::string>(response, ex, sent, this, &ObjectPrx::__ice_id, ctx);
+ return _makeLamdaOutgoing<::std::string>(response, ex, sent, this, &ObjectPrx::_iceI_id, context);
}
template<template<typename> class P = std::promise>
- auto ice_idAsync(const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ auto ice_idAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)
-> decltype(std::declval<P<::std::string>>().get_future())
{
- return makePromiseOutgoing<::std::string, P>(false, this, &ObjectPrx::__ice_id, ctx);
+ return _makePromiseOutgoing<::std::string, P>(false, this, &ObjectPrx::_iceI_id, context);
}
void
- __ice_id(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::string>>&, const ::Ice::Context&);
+ _iceI_id(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::string>>&, const ::Ice::Context&);
static const ::std::string& ice_staticId()
{
@@ -367,19 +367,19 @@ public:
::Ice::OperationMode mode,
const ::std::vector<Byte>& inP,
::std::vector<::Ice::Byte>& outParams,
- const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ const ::Ice::Context& context = ::Ice::noExplicitContext)
{
- return ice_invoke(operation, mode, ::IceInternal::makePair(inP), outParams, ctx);
+ return ice_invoke(operation, mode, ::IceInternal::makePair(inP), outParams, context);
}
template<template<typename> class P = std::promise> auto
ice_invokeAsync(const ::std::string& operation,
::Ice::OperationMode mode,
const ::std::vector<Byte>& inP,
- const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ const ::Ice::Context& context = ::Ice::noExplicitContext)
-> decltype(std::declval<P<::Ice::Object::Ice_invokeResult>>().get_future())
{
- return ice_invokeAsync<P>(operation, mode, ::IceInternal::makePair(inP), ctx);
+ return ice_invokeAsync<P>(operation, mode, ::IceInternal::makePair(inP), context);
}
::std::function<void()>
@@ -389,7 +389,7 @@ public:
::std::function<void(bool, ::std::vector<::Ice::Byte>)> response,
::std::function<void(::std::exception_ptr)> ex = nullptr,
::std::function<void(bool)> sent = nullptr,
- const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ const ::Ice::Context& context = ::Ice::noExplicitContext)
{
using Outgoing = ::IceInternal::InvokeLambdaOutgoing<::Ice::Object::Ice_invokeResult>;
::std::function<void(::Ice::Object::Ice_invokeResult&&)> r;
@@ -401,7 +401,7 @@ public:
};
}
auto outAsync = ::std::make_shared<Outgoing>(shared_from_this(), r, ex, sent);
- outAsync->invoke(operation, mode, ::IceInternal::makePair(inP), ctx);
+ outAsync->invoke(operation, mode, ::IceInternal::makePair(inP), context);
return [outAsync]() { outAsync->cancel(); };
}
@@ -415,12 +415,12 @@ public:
::Ice::OperationMode mode,
const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>& inP,
::std::vector<::Ice::Byte>& outParams,
- const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ const ::Ice::Context& context = ::Ice::noExplicitContext)
{
using Outgoing = ::IceInternal::InvokePromiseOutgoing<
::std::promise<::Ice::Object::Ice_invokeResult>, ::Ice::Object::Ice_invokeResult>;
auto outAsync = ::std::make_shared<Outgoing>(shared_from_this(), true);
- outAsync->invoke(operation, mode, inP, ctx);
+ outAsync->invoke(operation, mode, inP, context);
auto result = outAsync->getFuture().get();
outParams.swap(result.outParams);
return result.returnValue;
@@ -430,13 +430,13 @@ public:
ice_invokeAsync(const ::std::string& operation,
::Ice::OperationMode mode,
const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>& inP,
- const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ const ::Ice::Context& context = ::Ice::noExplicitContext)
-> decltype(std::declval<P<::Ice::Object::Ice_invokeResult>>().get_future())
{
using Outgoing =
::IceInternal::InvokePromiseOutgoing<P<::Ice::Object::Ice_invokeResult>, ::Ice::Object::Ice_invokeResult>;
auto outAsync = ::std::make_shared<Outgoing>(shared_from_this(), false);
- outAsync->invoke(operation, mode, inP, ctx);
+ outAsync->invoke(operation, mode, inP, context);
return outAsync->getFuture();
}
@@ -447,7 +447,7 @@ public:
::std::function<void(bool, ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>)> response,
::std::function<void(::std::exception_ptr)> ex = nullptr,
::std::function<void(bool)> sent = nullptr,
- const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ const ::Ice::Context& context = ::Ice::noExplicitContext)
{
using Result = ::std::tuple<bool, ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>>;
using Outgoing = ::IceInternal::InvokeLambdaOutgoing<Result>;
@@ -461,7 +461,7 @@ public:
};
}
auto outAsync = ::std::make_shared<Outgoing>(shared_from_this(), r, ex, sent);
- outAsync->invoke(operation, mode, inP, ctx);
+ outAsync->invoke(operation, mode, inP, context);
return [outAsync]() { outAsync->cancel(); };
}
@@ -541,7 +541,7 @@ public:
{
using LambdaOutgoing = ::IceInternal::ProxyGetConnectionLambda;
auto outAsync = ::std::make_shared<LambdaOutgoing>(shared_from_this(), response, ex, sent);
- __ice_getConnection(outAsync);
+ _iceI_getConnection(outAsync);
return [outAsync]() { outAsync->cancel(); };
}
@@ -550,11 +550,11 @@ public:
{
using PromiseOutgoing = ::IceInternal::ProxyGetConnectionPromise<P<::std::shared_ptr<::Ice::Connection>>>;
auto outAsync = ::std::make_shared<PromiseOutgoing>(shared_from_this());
- __ice_getConnection(outAsync);
+ _iceI_getConnection(outAsync);
return outAsync->getFuture();
}
- void __ice_getConnection(const ::std::shared_ptr<::IceInternal::ProxyGetConnection>&);
+ void _iceI_getConnection(const ::std::shared_ptr<::IceInternal::ProxyGetConnection>&);
::std::shared_ptr<::Ice::Connection> ice_getCachedConnection() const;
@@ -569,7 +569,7 @@ public:
{
using LambdaOutgoing = ::IceInternal::ProxyFlushBatchLambda;
auto outAsync = ::std::make_shared<LambdaOutgoing>(shared_from_this(), ex, sent);
- __ice_flushBatchRequests(outAsync);
+ _iceI_flushBatchRequests(outAsync);
return [outAsync]() { outAsync->cancel(); };
}
@@ -578,34 +578,34 @@ public:
{
using PromiseOutgoing = ::IceInternal::ProxyFlushBatchPromise<P<bool>>;
auto outAsync = ::std::make_shared<PromiseOutgoing>(shared_from_this());
- __ice_flushBatchRequests(outAsync);
+ _iceI_flushBatchRequests(outAsync);
return outAsync->getFuture();
}
- void __ice_flushBatchRequests(const ::std::shared_ptr<::IceInternal::ProxyFlushBatchAsync>&);
+ void _iceI_flushBatchRequests(const ::std::shared_ptr<::IceInternal::ProxyFlushBatchAsync>&);
- const ::IceInternal::ReferencePtr& __reference() const { return _reference; }
+ const ::IceInternal::ReferencePtr& _getReference() const { return _reference; }
- void __copyFrom(const std::shared_ptr<::Ice::ObjectPrx>&);
+ void _copyFrom(const std::shared_ptr<::Ice::ObjectPrx>&);
- int __handleException(const ::Ice::Exception&, const ::IceInternal::RequestHandlerPtr&, ::Ice::OperationMode,
+ int _handleException(const ::Ice::Exception&, const ::IceInternal::RequestHandlerPtr&, ::Ice::OperationMode,
bool, int&);
- void __checkTwowayOnly(const ::std::string&) const;
+ void _checkTwowayOnly(const ::std::string&) const;
- ::IceInternal::RequestHandlerPtr __getRequestHandler();
- ::IceInternal::BatchRequestQueuePtr __getBatchRequestQueue();
- ::IceInternal::RequestHandlerPtr __setRequestHandler(const ::IceInternal::RequestHandlerPtr&);
- void __updateRequestHandler(const ::IceInternal::RequestHandlerPtr&, const ::IceInternal::RequestHandlerPtr&);
+ ::IceInternal::RequestHandlerPtr _getRequestHandler();
+ ::IceInternal::BatchRequestQueuePtr _getBatchRequestQueue();
+ ::IceInternal::RequestHandlerPtr _setRequestHandler(const ::IceInternal::RequestHandlerPtr&);
+ void _updateRequestHandler(const ::IceInternal::RequestHandlerPtr&, const ::IceInternal::RequestHandlerPtr&);
- int __hash() const;
+ int _hash() const;
- void __write(OutputStream&) const;
+ void _write(OutputStream&) const;
protected:
template<typename R, template<typename> class P = ::std::promise, typename Obj, typename Fn, typename... Args>
- auto makePromiseOutgoing(bool sync, Obj obj, Fn fn, Args&&... args)
+ auto _makePromiseOutgoing(bool sync, Obj obj, Fn fn, Args&&... args)
-> decltype(std::declval<P<R>>().get_future())
{
auto outAsync = ::std::make_shared<::IceInternal::PromiseOutgoing<P<R>, R>>(shared_from_this(), sync);
@@ -614,14 +614,14 @@ protected:
}
template<typename R, typename Re, typename E, typename S, typename Obj, typename Fn, typename... Args>
- ::std::function<void()> makeLambdaOutgoing(Re r, E e, S s, Obj obj, Fn fn, Args&&... args)
+ ::std::function<void()> _makeLamdaOutgoing(Re r, E e, S s, Obj obj, Fn fn, Args&&... args)
{
auto outAsync = ::std::make_shared<::IceInternal::LambdaOutgoing<R>>(shared_from_this(), r, e, s);
(obj->*fn)(outAsync, std::forward<Args>(args)...);
return [outAsync]() { outAsync->cancel(); };
}
- virtual ::std::shared_ptr<ObjectPrx> __newInstance() const;
+ virtual ::std::shared_ptr<ObjectPrx> _newInstance() const;
ObjectPrx() = default;
friend ::std::shared_ptr<ObjectPrx> IceInternal::createProxy<ObjectPrx>();
@@ -772,7 +772,7 @@ public:
protected:
- virtual ::std::shared_ptr<ObjectPrx> __newInstance() const = 0;
+ virtual ::std::shared_ptr<ObjectPrx> _newInstance() const = 0;
};
ICE_API ::std::ostream& operator<<(::std::ostream&, const ::Ice::ObjectPrx&);
@@ -828,7 +828,7 @@ uncheckedCast(const ::std::shared_ptr<T>& b)
if(!r)
{
r = IceInternal::createProxy<P>();
- r->__copyFrom(b);
+ r->_copyFrom(b);
}
}
return r;
@@ -844,7 +844,7 @@ uncheckedCast(const ::std::shared_ptr<T>& b, const std::string& f)
if(b)
{
r = IceInternal::createProxy<P>();
- r->__copyFrom(b->ice_facet(f));
+ r->_copyFrom(b->ice_facet(f));
}
return r;
}
@@ -861,7 +861,7 @@ checkedCast(const ::std::shared_ptr<T>& b, const ::Ice::Context& context = Ice::
if(b->ice_isA(P::ice_staticId(), context))
{
r = IceInternal::createProxy<P>();
- r->__copyFrom(b);
+ r->_copyFrom(b);
}
}
return r;
@@ -882,7 +882,7 @@ checkedCast(const ::std::shared_ptr<T>& b, const std::string& f, const ::Ice::Co
if(bb->ice_isA(P::ice_staticId(), context))
{
r = IceInternal::createProxy<P>();
- r->__copyFrom(bb);
+ r->_copyFrom(bb);
}
}
catch(const Ice::FacetNotExistException&)
@@ -962,157 +962,157 @@ public:
::std::string ice_toString() const;
- bool ice_isA(const ::std::string& typeId, const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ bool ice_isA(const ::std::string& typeId, const ::Ice::Context& context = ::Ice::noExplicitContext)
{
- return end_ice_isA(__begin_ice_isA(typeId, ctx, ::IceInternal::__dummyCallback, 0, true));
+ return end_ice_isA(_iceI_begin_ice_isA(typeId, context, ::IceInternal::dummyCallback, 0, true));
}
::Ice::AsyncResultPtr begin_ice_isA(const ::std::string& typeId,
- const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ const ::Ice::Context& context = ::Ice::noExplicitContext)
{
- return __begin_ice_isA(typeId, ctx, ::IceInternal::__dummyCallback, 0);
+ return _iceI_begin_ice_isA(typeId, context, ::IceInternal::dummyCallback, 0);
}
::Ice::AsyncResultPtr begin_ice_isA(const ::std::string& typeId,
const ::Ice::CallbackPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_isA(typeId, ::Ice::noExplicitContext, del, cookie);
+ return _iceI_begin_ice_isA(typeId, ::Ice::noExplicitContext, del, cookie);
}
::Ice::AsyncResultPtr begin_ice_isA(const ::std::string& typeId,
- const ::Ice::Context& ctx,
+ const ::Ice::Context& context,
const ::Ice::CallbackPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_isA(typeId, ctx, del, cookie);
+ return _iceI_begin_ice_isA(typeId, context, del, cookie);
}
::Ice::AsyncResultPtr begin_ice_isA(const ::std::string& typeId,
const ::Ice::Callback_Object_ice_isAPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_isA(typeId, ::Ice::noExplicitContext, del, cookie);
+ return _iceI_begin_ice_isA(typeId, ::Ice::noExplicitContext, del, cookie);
}
::Ice::AsyncResultPtr begin_ice_isA(const ::std::string& typeId,
- const ::Ice::Context& ctx,
+ const ::Ice::Context& context,
const ::Ice::Callback_Object_ice_isAPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_isA(typeId, ctx, del, cookie);
+ return _iceI_begin_ice_isA(typeId, context, del, cookie);
}
bool end_ice_isA(const ::Ice::AsyncResultPtr&);
- void ice_ping(const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ void ice_ping(const ::Ice::Context& context = ::Ice::noExplicitContext)
{
- end_ice_ping(__begin_ice_ping(ctx, ::IceInternal::__dummyCallback, 0, true));
+ end_ice_ping(_iceI_begin_ice_ping(context, ::IceInternal::dummyCallback, 0, true));
}
- ::Ice::AsyncResultPtr begin_ice_ping(const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ ::Ice::AsyncResultPtr begin_ice_ping(const ::Ice::Context& context = ::Ice::noExplicitContext)
{
- return __begin_ice_ping(ctx, ::IceInternal::__dummyCallback, 0);
+ return _iceI_begin_ice_ping(context, ::IceInternal::dummyCallback, 0);
}
::Ice::AsyncResultPtr begin_ice_ping(const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_ping(::Ice::noExplicitContext, del, cookie);
+ return _iceI_begin_ice_ping(::Ice::noExplicitContext, del, cookie);
}
- ::Ice::AsyncResultPtr begin_ice_ping(const ::Ice::Context& ctx, const ::Ice::CallbackPtr& del,
+ ::Ice::AsyncResultPtr begin_ice_ping(const ::Ice::Context& context, const ::Ice::CallbackPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_ping(ctx, del, cookie);
+ return _iceI_begin_ice_ping(context, del, cookie);
}
::Ice::AsyncResultPtr begin_ice_ping(const ::Ice::Callback_Object_ice_pingPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_ping(::Ice::noExplicitContext, del, cookie);
+ return _iceI_begin_ice_ping(::Ice::noExplicitContext, del, cookie);
}
- ::Ice::AsyncResultPtr begin_ice_ping(const ::Ice::Context& ctx, const ::Ice::Callback_Object_ice_pingPtr& del,
+ ::Ice::AsyncResultPtr begin_ice_ping(const ::Ice::Context& context, const ::Ice::Callback_Object_ice_pingPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_ping(ctx, del, cookie);
+ return _iceI_begin_ice_ping(context, del, cookie);
}
void end_ice_ping(const ::Ice::AsyncResultPtr&);
- ::std::vector< ::std::string> ice_ids(const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ ::std::vector< ::std::string> ice_ids(const ::Ice::Context& context = ::Ice::noExplicitContext)
{
- return end_ice_ids(__begin_ice_ids(ctx, ::IceInternal::__dummyCallback, 0, true));
+ return end_ice_ids(_iceI_begin_ice_ids(context, ::IceInternal::dummyCallback, 0, true));
}
- ::Ice::AsyncResultPtr begin_ice_ids(const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ ::Ice::AsyncResultPtr begin_ice_ids(const ::Ice::Context& context = ::Ice::noExplicitContext)
{
- return __begin_ice_ids(ctx, ::IceInternal::__dummyCallback, 0);
+ return _iceI_begin_ice_ids(context, ::IceInternal::dummyCallback, 0);
}
::Ice::AsyncResultPtr begin_ice_ids(const ::Ice::CallbackPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_ids(::Ice::noExplicitContext, del, cookie);
+ return _iceI_begin_ice_ids(::Ice::noExplicitContext, del, cookie);
}
- ::Ice::AsyncResultPtr begin_ice_ids(const ::Ice::Context& ctx,
+ ::Ice::AsyncResultPtr begin_ice_ids(const ::Ice::Context& context,
const ::Ice::CallbackPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_ids(ctx, del, cookie);
+ return _iceI_begin_ice_ids(context, del, cookie);
}
::Ice::AsyncResultPtr begin_ice_ids(const ::Ice::Callback_Object_ice_idsPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_ids(::Ice::noExplicitContext, del, cookie);
+ return _iceI_begin_ice_ids(::Ice::noExplicitContext, del, cookie);
}
- ::Ice::AsyncResultPtr begin_ice_ids(const ::Ice::Context& ctx,
+ ::Ice::AsyncResultPtr begin_ice_ids(const ::Ice::Context& context,
const ::Ice::Callback_Object_ice_idsPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_ids(ctx, del, cookie);
+ return _iceI_begin_ice_ids(context, del, cookie);
}
::std::vector< ::std::string> end_ice_ids(const ::Ice::AsyncResultPtr&);
- ::std::string ice_id(const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ ::std::string ice_id(const ::Ice::Context& context = ::Ice::noExplicitContext)
{
- return end_ice_id(__begin_ice_id(ctx, ::IceInternal::__dummyCallback, 0, true));
+ return end_ice_id(_iceI_begin_ice_id(context, ::IceInternal::dummyCallback, 0, true));
}
- ::Ice::AsyncResultPtr begin_ice_id(const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ ::Ice::AsyncResultPtr begin_ice_id(const ::Ice::Context& context = ::Ice::noExplicitContext)
{
- return __begin_ice_id(ctx, ::IceInternal::__dummyCallback, 0);
+ return _iceI_begin_ice_id(context, ::IceInternal::dummyCallback, 0);
}
::Ice::AsyncResultPtr begin_ice_id(const ::Ice::CallbackPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_id(::Ice::noExplicitContext, del, cookie);
+ return _iceI_begin_ice_id(::Ice::noExplicitContext, del, cookie);
}
- ::Ice::AsyncResultPtr begin_ice_id(const ::Ice::Context& ctx,
+ ::Ice::AsyncResultPtr begin_ice_id(const ::Ice::Context& context,
const ::Ice::CallbackPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_id(ctx, del, cookie);
+ return _iceI_begin_ice_id(context, del, cookie);
}
::Ice::AsyncResultPtr begin_ice_id(const ::Ice::Callback_Object_ice_idPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_id(::Ice::noExplicitContext, del, cookie);
+ return _iceI_begin_ice_id(::Ice::noExplicitContext, del, cookie);
}
- ::Ice::AsyncResultPtr begin_ice_id(const ::Ice::Context& ctx,
+ ::Ice::AsyncResultPtr begin_ice_id(const ::Ice::Context& context,
const ::Ice::Callback_Object_ice_idPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_id(ctx, del, cookie);
+ return _iceI_begin_ice_id(context, del, cookie);
}
::std::string end_ice_id(const ::Ice::AsyncResultPtr&);
@@ -1134,15 +1134,15 @@ public:
::Ice::OperationMode mode,
const ::std::vector< ::Ice::Byte>& inParams)
{
- return __begin_ice_invoke(op, mode, inParams, ::Ice::noExplicitContext, ::IceInternal::__dummyCallback, 0);
+ return _iceI_begin_ice_invoke(op, mode, inParams, ::Ice::noExplicitContext, ::IceInternal::dummyCallback, 0);
}
::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& op,
::Ice::OperationMode mode,
const ::std::vector< ::Ice::Byte>& inParams,
- const ::Ice::Context& ctx)
+ const ::Ice::Context& context)
{
- return __begin_ice_invoke(op, mode, inParams, ctx, ::IceInternal::__dummyCallback, 0);
+ return _iceI_begin_ice_invoke(op, mode, inParams, context, ::IceInternal::dummyCallback, 0);
}
::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& op,
@@ -1151,17 +1151,17 @@ public:
const ::Ice::CallbackPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_invoke(op, mode, inParams, ::Ice::noExplicitContext, del, cookie);
+ return _iceI_begin_ice_invoke(op, mode, inParams, ::Ice::noExplicitContext, del, cookie);
}
::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& op,
::Ice::OperationMode mode,
const ::std::vector< ::Ice::Byte>& inParams,
- const ::Ice::Context& ctx,
+ const ::Ice::Context& context,
const ::Ice::CallbackPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_invoke(op, mode, inParams, ctx, del, cookie);
+ return _iceI_begin_ice_invoke(op, mode, inParams, context, del, cookie);
}
::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& op,
@@ -1170,17 +1170,17 @@ public:
const ::Ice::Callback_Object_ice_invokePtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_invoke(op, mode, inParams, ::Ice::noExplicitContext, del, cookie);
+ return _iceI_begin_ice_invoke(op, mode, inParams, ::Ice::noExplicitContext, del, cookie);
}
::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& op,
::Ice::OperationMode mode,
const ::std::vector< ::Ice::Byte>& inParams,
- const ::Ice::Context& ctx,
+ const ::Ice::Context& context,
const ::Ice::Callback_Object_ice_invokePtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_invoke(op, mode, inParams, ctx, del, cookie);
+ return _iceI_begin_ice_invoke(op, mode, inParams, context, del, cookie);
}
bool end_ice_invoke(::std::vector< ::Ice::Byte>&, const ::Ice::AsyncResultPtr&);
@@ -1189,25 +1189,25 @@ public:
::Ice::OperationMode mode,
const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>& inP,
::std::vector< ::Ice::Byte>& outP,
- const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+ const ::Ice::Context& context = ::Ice::noExplicitContext)
{
- return end_ice_invoke(outP, __begin_ice_invoke(op, mode, inP, ctx, ::IceInternal::__dummyCallback, 0, true));
+ return end_ice_invoke(outP, _iceI_begin_ice_invoke(op, mode, inP, context, ::IceInternal::dummyCallback, 0, true));
}
::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& op,
::Ice::OperationMode mode,
const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>& inParams)
{
- return __begin_ice_invoke(op, mode, inParams, ::Ice::noExplicitContext, ::IceInternal::__dummyCallback, 0);
+ return _iceI_begin_ice_invoke(op, mode, inParams, ::Ice::noExplicitContext, ::IceInternal::dummyCallback, 0);
}
::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& op,
::Ice::OperationMode mode,
const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>& inParams,
- const ::Ice::Context& ctx,
+ const ::Ice::Context& context,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_invoke(op, mode, inParams, ctx, ::IceInternal::__dummyCallback, cookie);
+ return _iceI_begin_ice_invoke(op, mode, inParams, context, ::IceInternal::dummyCallback, cookie);
}
::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& op,
@@ -1216,17 +1216,17 @@ public:
const ::Ice::CallbackPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_invoke(op, mode, inParams, ::Ice::noExplicitContext, del, cookie);
+ return _iceI_begin_ice_invoke(op, mode, inParams, ::Ice::noExplicitContext, del, cookie);
}
::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& op,
::Ice::OperationMode mode,
const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>& inParams,
- const ::Ice::Context& ctx,
+ const ::Ice::Context& context,
const ::Ice::CallbackPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_invoke(op, mode, inParams, ctx, del, cookie);
+ return _iceI_begin_ice_invoke(op, mode, inParams, context, del, cookie);
}
::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& op,
@@ -1235,20 +1235,20 @@ public:
const ::Ice::Callback_Object_ice_invokePtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_invoke(op, mode, inParams, ::Ice::noExplicitContext, del, cookie);
+ return _iceI_begin_ice_invoke(op, mode, inParams, ::Ice::noExplicitContext, del, cookie);
}
::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& op,
::Ice::OperationMode mode,
const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>& inParams,
- const ::Ice::Context& ctx,
+ const ::Ice::Context& context,
const ::Ice::Callback_Object_ice_invokePtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_invoke(op, mode, inParams, ctx, del, cookie);
+ return _iceI_begin_ice_invoke(op, mode, inParams, context, del, cookie);
}
- bool ___end_ice_invoke(::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&, const ::Ice::AsyncResultPtr&);
+ bool _iceI_end_ice_invoke(::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&, const ::Ice::AsyncResultPtr&);
::Ice::Identity ice_getIdentity() const;
::Ice::ObjectPrx ice_identity(const ::Ice::Identity&) const;
@@ -1319,19 +1319,19 @@ public:
::Ice::AsyncResultPtr begin_ice_getConnection()
{
- return __begin_ice_getConnection(::IceInternal::__dummyCallback, 0);
+ return _iceI_begin_ice_getConnection(::IceInternal::dummyCallback, 0);
}
::Ice::AsyncResultPtr begin_ice_getConnection(const ::Ice::CallbackPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_getConnection(del, cookie);
+ return _iceI_begin_ice_getConnection(del, cookie);
}
::Ice::AsyncResultPtr begin_ice_getConnection(const ::Ice::Callback_Object_ice_getConnectionPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_getConnection(del, cookie);
+ return _iceI_begin_ice_getConnection(del, cookie);
}
::Ice::ConnectionPtr end_ice_getConnection(const ::Ice::AsyncResultPtr&);
@@ -1345,71 +1345,71 @@ public:
::Ice::AsyncResultPtr begin_ice_flushBatchRequests()
{
- return __begin_ice_flushBatchRequests(::IceInternal::__dummyCallback, 0);
+ return _iceI_begin_ice_flushBatchRequests(::IceInternal::dummyCallback, 0);
}
::Ice::AsyncResultPtr begin_ice_flushBatchRequests(const ::Ice::CallbackPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_flushBatchRequests(del, cookie);
+ return _iceI_begin_ice_flushBatchRequests(del, cookie);
}
::Ice::AsyncResultPtr begin_ice_flushBatchRequests(const ::Ice::Callback_Object_ice_flushBatchRequestsPtr& del,
const ::Ice::LocalObjectPtr& cookie = 0)
{
- return __begin_ice_flushBatchRequests(del, cookie);
+ return _iceI_begin_ice_flushBatchRequests(del, cookie);
}
void end_ice_flushBatchRequests(const ::Ice::AsyncResultPtr&);
- const ::IceInternal::ReferencePtr& __reference() const { return _reference; }
+ const ::IceInternal::ReferencePtr& _getReference() const { return _reference; }
- ::Ice::Int __hash() const;
+ ::Ice::Int _hash() const;
- void __copyFrom(const ::Ice::ObjectPrx&);
+ void _copyFrom(const ::Ice::ObjectPrx&);
- int __handleException(const ::Ice::Exception&, const ::IceInternal::RequestHandlerPtr&, ::Ice::OperationMode,
+ int _handleException(const ::Ice::Exception&, const ::IceInternal::RequestHandlerPtr&, ::Ice::OperationMode,
bool, int&);
- void __checkTwowayOnly(const ::std::string&, bool) const;
+ void _checkTwowayOnly(const ::std::string&, bool) const;
- void __end(const ::Ice::AsyncResultPtr&, const std::string&) const;
+ void _end(const ::Ice::AsyncResultPtr&, const std::string&) const;
- ::IceInternal::RequestHandlerPtr __getRequestHandler();
- ::IceInternal::BatchRequestQueuePtr __getBatchRequestQueue();
- ::IceInternal::RequestHandlerPtr __setRequestHandler(const ::IceInternal::RequestHandlerPtr&);
- void __updateRequestHandler(const ::IceInternal::RequestHandlerPtr&, const ::IceInternal::RequestHandlerPtr&);
+ ::IceInternal::RequestHandlerPtr _getRequestHandler();
+ ::IceInternal::BatchRequestQueuePtr _getBatchRequestQueue();
+ ::IceInternal::RequestHandlerPtr _setRequestHandler(const ::IceInternal::RequestHandlerPtr&);
+ void _updateRequestHandler(const ::IceInternal::RequestHandlerPtr&, const ::IceInternal::RequestHandlerPtr&);
- void __write(::Ice::OutputStream&) const;
+ void _write(::Ice::OutputStream&) const;
protected:
- virtual Object* __newInstance() const;
+ virtual Object* _newInstance() const;
private:
- ::Ice::AsyncResultPtr __begin_ice_isA(const ::std::string&,
+ ::Ice::AsyncResultPtr _iceI_begin_ice_isA(const ::std::string&,
const ::Ice::Context&,
const ::IceInternal::CallbackBasePtr&,
const ::Ice::LocalObjectPtr&,
bool = false);
- ::Ice::AsyncResultPtr __begin_ice_ping(const ::Ice::Context&,
+ ::Ice::AsyncResultPtr _iceI_begin_ice_ping(const ::Ice::Context&,
const ::IceInternal::CallbackBasePtr&,
const ::Ice::LocalObjectPtr&,
bool = false);
- ::Ice::AsyncResultPtr __begin_ice_ids(const ::Ice::Context&,
+ ::Ice::AsyncResultPtr _iceI_begin_ice_ids(const ::Ice::Context&,
const ::IceInternal::CallbackBasePtr&,
const ::Ice::LocalObjectPtr&,
bool = false);
- ::Ice::AsyncResultPtr __begin_ice_id(const ::Ice::Context&,
+ ::Ice::AsyncResultPtr _iceI_begin_ice_id(const ::Ice::Context&,
const ::IceInternal::CallbackBasePtr&,
const ::Ice::LocalObjectPtr&,
bool = false);
- ::Ice::AsyncResultPtr __begin_ice_invoke(const ::std::string&,
+ ::Ice::AsyncResultPtr _iceI_begin_ice_invoke(const ::std::string&,
::Ice::OperationMode,
const ::std::vector< ::Ice::Byte>&,
const ::Ice::Context&,
@@ -1417,7 +1417,7 @@ private:
const ::Ice::LocalObjectPtr&,
bool = false);
- ::Ice::AsyncResultPtr __begin_ice_invoke(const ::std::string&,
+ ::Ice::AsyncResultPtr _iceI_begin_ice_invoke(const ::std::string&,
::Ice::OperationMode,
const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&,
const ::Ice::Context&,
@@ -1425,10 +1425,10 @@ private:
const ::Ice::LocalObjectPtr&,
bool = false);
- ::Ice::AsyncResultPtr __begin_ice_getConnection(const ::IceInternal::CallbackBasePtr&,
+ ::Ice::AsyncResultPtr _iceI_begin_ice_getConnection(const ::IceInternal::CallbackBasePtr&,
const ::Ice::LocalObjectPtr&);
- ::Ice::AsyncResultPtr __begin_ice_flushBatchRequests(const ::IceInternal::CallbackBasePtr&,
+ ::Ice::AsyncResultPtr _iceI_begin_ice_flushBatchRequests(const ::IceInternal::CallbackBasePtr&,
const ::Ice::LocalObjectPtr&);
void setup(const ::IceInternal::ReferencePtr&);
@@ -1559,7 +1559,7 @@ public:
protected:
- virtual ::IceProxy::Ice::Object* __newInstance() const = 0;
+ virtual ::IceProxy::Ice::Object* _newInstance() const = 0;
};
ICE_API bool proxyIdentityLess(const ObjectPrx&, const ObjectPrx&);
@@ -1611,8 +1611,8 @@ namespace IceInternal
template<typename T, typename U>
inline bool operator==(const ProxyHandle<T>& lhs, const ProxyHandle<U>& rhs)
{
- ::IceProxy::Ice::Object* l = lhs.__upCast();
- ::IceProxy::Ice::Object* r = rhs.__upCast();
+ ::IceProxy::Ice::Object* l = lhs._upCast();
+ ::IceProxy::Ice::Object* r = rhs._upCast();
if(l && r)
{
return *l == *r;
@@ -1632,8 +1632,8 @@ inline bool operator!=(const ProxyHandle<T>& lhs, const ProxyHandle<U>& rhs)
template<typename T, typename U>
inline bool operator<(const ProxyHandle<T>& lhs, const ProxyHandle<U>& rhs)
{
- ::IceProxy::Ice::Object* l = lhs.__upCast();
- ::IceProxy::Ice::Object* r = rhs.__upCast();
+ ::IceProxy::Ice::Object* l = lhs._upCast();
+ ::IceProxy::Ice::Object* r = rhs._upCast();
if(l && r)
{
return *l < *r;
@@ -1677,7 +1677,7 @@ checkedCastImpl(const ::Ice::ObjectPrx& b, const ::Ice::Context& context)
if(b->ice_isA(T::ice_staticId(), context))
{
d = new T;
- d->__copyFrom(b);
+ d->_copyFrom(b);
}
}
return d;
@@ -1695,7 +1695,7 @@ uncheckedCastImpl(const ::Ice::ObjectPrx& b)
if(!d)
{
d = new T;
- d->__copyFrom(b);
+ d->_copyFrom(b);
}
}
return d;
@@ -1744,7 +1744,7 @@ checkedCastImpl(const ::Ice::ObjectPrx& b, const std::string& f, const ::Ice::Co
if(bb)
{
d = new T;
- d->__copyFrom(bb);
+ d->_copyFrom(bb);
}
return d;
}
@@ -1759,7 +1759,7 @@ uncheckedCastImpl(const ::Ice::ObjectPrx& b, const std::string& f)
::Ice::ObjectPrx bb = b->ice_facet(f);
d = new T;
- d->__copyFrom(bb);
+ d->_copyFrom(bb);
}
return d;
}
@@ -1772,10 +1772,10 @@ namespace Ice
{
template<typename P, typename Y> inline P
-checkedCast(const ::IceInternal::ProxyHandle<Y>& b, const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+checkedCast(const ::IceInternal::ProxyHandle<Y>& b, const ::Ice::Context& context = ::Ice::noExplicitContext)
{
Y* tag = 0;
- return ::IceInternal::checkedCastHelper<typename P::element_type>(b, tag, ctx);
+ return ::IceInternal::checkedCastHelper<typename P::element_type>(b, tag, context);
}
template<typename P, typename Y> inline P
@@ -1786,9 +1786,9 @@ uncheckedCast(const ::IceInternal::ProxyHandle<Y>& b)
}
template<typename P> inline P
-checkedCast(const ::Ice::ObjectPrx& b, const std::string& f, const ::Ice::Context& ctx = ::Ice::noExplicitContext)
+checkedCast(const ::Ice::ObjectPrx& b, const std::string& f, const ::Ice::Context& context = ::Ice::noExplicitContext)
{
- return ::IceInternal::checkedCastImpl<P>(b, f, ctx);
+ return ::IceInternal::checkedCastImpl<P>(b, f, context);
}
template<typename P> inline P
@@ -1977,7 +1977,7 @@ public:
{
try
{
- result->getProxy()->__end(result, result->getOperation());
+ result->getProxy()->_end(result, result->getOperation());
}
catch(const ::Ice::Exception& ex)
{
@@ -2016,7 +2016,7 @@ public:
{
try
{
- result->getProxy()->__end(result, result->getOperation());
+ result->getProxy()->_end(result, result->getOperation());
}
catch(const ::Ice::Exception& ex)
{
@@ -2055,21 +2055,21 @@ public:
{
}
- virtual void completed(const ::Ice::AsyncResultPtr& __result) const
+ virtual void completed(const ::Ice::AsyncResultPtr& result) const
{
- bool __ret;
+ bool ret;
try
{
- __ret = __result->getProxy()->end_ice_isA(__result);
+ ret = result->getProxy()->end_ice_isA(result);
}
catch(const ::Ice::Exception& ex)
{
- ::IceInternal::CallbackNC<T>::exception(__result, ex);
+ ::IceInternal::CallbackNC<T>::exception(result, ex);
return;
}
if(_response)
{
- (::IceInternal::CallbackNC<T>::_callback.get()->*_response)(__ret);
+ (::IceInternal::CallbackNC<T>::_callback.get()->*_response)(ret);
}
}
@@ -2094,22 +2094,22 @@ public:
{
}
- virtual void completed(const ::Ice::AsyncResultPtr& __result) const
+ virtual void completed(const ::Ice::AsyncResultPtr& result) const
{
- bool __ret;
+ bool ret;
try
{
- __ret = __result->getProxy()->end_ice_isA(__result);
+ ret = result->getProxy()->end_ice_isA(result);
}
catch(const ::Ice::Exception& ex)
{
- ::IceInternal::Callback<T, CT>::exception(__result, ex);
+ ::IceInternal::Callback<T, CT>::exception(result, ex);
return;
}
if(_response)
{
- (::IceInternal::Callback<T, CT>::_callback.get()->*_response)(__ret,
- CT::dynamicCast(__result->getCookie()));
+ (::IceInternal::Callback<T, CT>::_callback.get()->*_response)(ret,
+ CT::dynamicCast(result->getCookie()));
}
}
@@ -2168,21 +2168,21 @@ public:
{
}
- virtual void completed(const ::Ice::AsyncResultPtr& __result) const
+ virtual void completed(const ::Ice::AsyncResultPtr& result) const
{
- ::std::vector< ::std::string> __ret;
+ ::std::vector< ::std::string> ret;
try
{
- __ret = __result->getProxy()->end_ice_ids(__result);
+ ret = result->getProxy()->end_ice_ids(result);
}
catch(const ::Ice::Exception& ex)
{
- ::IceInternal::CallbackNC<T>::exception(__result, ex);
+ ::IceInternal::CallbackNC<T>::exception(result, ex);
return;
}
if(_response)
{
- (::IceInternal::CallbackNC<T>::_callback.get()->*_response)(__ret);
+ (::IceInternal::CallbackNC<T>::_callback.get()->*_response)(ret);
}
}
@@ -2207,22 +2207,22 @@ public:
{
}
- virtual void completed(const ::Ice::AsyncResultPtr& __result) const
+ virtual void completed(const ::Ice::AsyncResultPtr& result) const
{
- ::std::vector< ::std::string> __ret;
+ ::std::vector< ::std::string> ret;
try
{
- __ret = __result->getProxy()->end_ice_ids(__result);
+ ret = result->getProxy()->end_ice_ids(result);
}
catch(const ::Ice::Exception& ex)
{
- ::IceInternal::Callback<T, CT>::exception(__result, ex);
+ ::IceInternal::Callback<T, CT>::exception(result, ex);
return;
}
if(_response)
{
- (::IceInternal::Callback<T, CT>::_callback.get()->*_response)(__ret,
- CT::dynamicCast(__result->getCookie()));
+ (::IceInternal::Callback<T, CT>::_callback.get()->*_response)(ret,
+ CT::dynamicCast(result->getCookie()));
}
}
@@ -2247,21 +2247,21 @@ public:
{
}
- virtual void completed(const ::Ice::AsyncResultPtr& __result) const
+ virtual void completed(const ::Ice::AsyncResultPtr& result) const
{
- ::std::string __ret;
+ ::std::string ret;
try
{
- __ret = __result->getProxy()->end_ice_id(__result);
+ ret = result->getProxy()->end_ice_id(result);
}
catch(const ::Ice::Exception& ex)
{
- ::IceInternal::CallbackNC<T>::exception(__result, ex);
+ ::IceInternal::CallbackNC<T>::exception(result, ex);
return;
}
if(_response)
{
- (::IceInternal::CallbackNC<T>::_callback.get()->*_response)(__ret);
+ (::IceInternal::CallbackNC<T>::_callback.get()->*_response)(ret);
}
}
@@ -2286,22 +2286,22 @@ public:
{
}
- virtual void completed(const ::Ice::AsyncResultPtr& __result) const
+ virtual void completed(const ::Ice::AsyncResultPtr& result) const
{
- ::std::string __ret;
+ ::std::string ret;
try
{
- __ret = __result->getProxy()->end_ice_id(__result);
+ ret = result->getProxy()->end_ice_id(result);
}
catch(const ::Ice::Exception& ex)
{
- ::IceInternal::Callback<T, CT>::exception(__result, ex);
+ ::IceInternal::Callback<T, CT>::exception(result, ex);
return;
}
if(_response)
{
- (::IceInternal::Callback<T, CT>::_callback.get()->*_response)(__ret,
- CT::dynamicCast(__result->getCookie()));
+ (::IceInternal::Callback<T, CT>::_callback.get()->*_response)(ret,
+ CT::dynamicCast(result->getCookie()));
}
}
@@ -2332,39 +2332,39 @@ public:
{
}
- virtual void completed(const ::Ice::AsyncResultPtr& __result) const
+ virtual void completed(const ::Ice::AsyncResultPtr& result) const
{
if(_response)
{
- bool __ok;
+ bool ok;
std::vector< ::Ice::Byte> outParams;
try
{
- __ok = __result->getProxy()->end_ice_invoke(outParams, __result);
+ ok = result->getProxy()->end_ice_invoke(outParams, result);
}
catch(const ::Ice::Exception& ex)
{
- ::IceInternal::CallbackNC<T>::exception(__result, ex);
+ ::IceInternal::CallbackNC<T>::exception(result, ex);
return;
}
- (::IceInternal::CallbackNC<T>::_callback.get()->*_response)(__ok, outParams);
+ (::IceInternal::CallbackNC<T>::_callback.get()->*_response)(ok, outParams);
}
else
{
- bool __ok;
+ bool ok;
std::pair<const ::Ice::Byte*, const::Ice::Byte*> outParams;
try
{
- __ok = __result->getProxy()->___end_ice_invoke(outParams, __result);
+ ok = result->getProxy()->_iceI_end_ice_invoke(outParams, result);
}
catch(const ::Ice::Exception& ex)
{
- ::IceInternal::CallbackNC<T>::exception(__result, ex);
+ ::IceInternal::CallbackNC<T>::exception(result, ex);
return;
}
if(_responseArray)
{
- (::IceInternal::CallbackNC<T>::_callback.get()->*_responseArray)(__ok, outParams);
+ (::IceInternal::CallbackNC<T>::_callback.get()->*_responseArray)(ok, outParams);
}
}
}
@@ -2397,44 +2397,44 @@ public:
{
}
- virtual void completed(const ::Ice::AsyncResultPtr& __result) const
+ virtual void completed(const ::Ice::AsyncResultPtr& result) const
{
if(_response)
{
- bool __ok;
+ bool ok;
std::vector< ::Ice::Byte> outParams;
try
{
- __ok = __result->getProxy()->end_ice_invoke(outParams, __result);
+ ok = result->getProxy()->end_ice_invoke(outParams, result);
}
catch(const ::Ice::Exception& ex)
{
- ::IceInternal::Callback<T, CT>::exception(__result, ex);
+ ::IceInternal::Callback<T, CT>::exception(result, ex);
return;
}
- (::IceInternal::Callback<T, CT>::_callback.get()->*_response)(__ok,
+ (::IceInternal::Callback<T, CT>::_callback.get()->*_response)(ok,
outParams,
- CT::dynamicCast(__result->getCookie()));
+ CT::dynamicCast(result->getCookie()));
}
else
{
- bool __ok;
+ bool ok;
std::pair<const ::Ice::Byte*, const::Ice::Byte*> outParams;
try
{
- __ok = __result->getProxy()->___end_ice_invoke(outParams, __result);
+ ok = result->getProxy()->_iceI_end_ice_invoke(outParams, result);
}
catch(const ::Ice::Exception& ex)
{
- ::IceInternal::Callback<T, CT>::exception(__result, ex);
+ ::IceInternal::Callback<T, CT>::exception(result, ex);
return;
}
if(_responseArray)
{
- (::IceInternal::Callback<T, CT>::_callback.get()->*_responseArray)(__ok,
+ (::IceInternal::Callback<T, CT>::_callback.get()->*_responseArray)(ok,
outParams,
CT::dynamicCast(
- __result->getCookie()));
+ result->getCookie()));
}
}
}
@@ -2463,21 +2463,21 @@ public:
}
- virtual void completed(const ::Ice::AsyncResultPtr& __result) const
+ virtual void completed(const ::Ice::AsyncResultPtr& result) const
{
- ::Ice::ConnectionPtr __ret;
+ ::Ice::ConnectionPtr ret;
try
{
- __ret = __result->getProxy()->end_ice_getConnection(__result);
+ ret = result->getProxy()->end_ice_getConnection(result);
}
catch(const ::Ice::Exception& ex)
{
- ::IceInternal::CallbackNC<T>::exception(__result, ex);
+ ::IceInternal::CallbackNC<T>::exception(result, ex);
return;
}
if(_response)
{
- (::IceInternal::CallbackNC<T>::_callback.get()->*_response)(__ret);
+ (::IceInternal::CallbackNC<T>::_callback.get()->*_response)(ret);
}
}
@@ -2503,22 +2503,22 @@ public:
{
}
- virtual void completed(const ::Ice::AsyncResultPtr& __result) const
+ virtual void completed(const ::Ice::AsyncResultPtr& result) const
{
- ::Ice::ConnectionPtr __ret;
+ ::Ice::ConnectionPtr ret;
try
{
- __ret = __result->getProxy()->end_ice_getConnection(__result);
+ ret = result->getProxy()->end_ice_getConnection(result);
}
catch(const ::Ice::Exception& ex)
{
- ::IceInternal::Callback<T, CT>::exception(__result, ex);
+ ::IceInternal::Callback<T, CT>::exception(result, ex);
return;
}
if(_response)
{
- (::IceInternal::Callback<T, CT>::_callback.get()->*_response)(__ret,
- CT::dynamicCast(__result->getCookie()));
+ (::IceInternal::Callback<T, CT>::_callback.get()->*_response)(ret,
+ CT::dynamicCast(result->getCookie()));
}
}
diff --git a/cpp/include/Ice/ProxyHandle.h b/cpp/include/Ice/ProxyHandle.h
index 628fb2b460b..d763a146513 100644
--- a/cpp/include/Ice/ProxyHandle.h
+++ b/cpp/include/Ice/ProxyHandle.h
@@ -247,7 +247,7 @@ public:
return *this;
}
- ::IceProxy::Ice::Object* __upCast() const
+ ::IceProxy::Ice::Object* _upCast() const
{
return upCast(this->_ptr);
}
diff --git a/cpp/include/Ice/SlicedData.h b/cpp/include/Ice/SlicedData.h
index dcd322b661b..820bdda2732 100644
--- a/cpp/include/Ice/SlicedData.h
+++ b/cpp/include/Ice/SlicedData.h
@@ -74,7 +74,7 @@ public:
const SliceInfoSeq slices;
#ifndef ICE_CPP11_MAPPING
- void __gcVisitMembers(IceInternal::GCVisitor&);
+ void _iceGcVisitMembers(IceInternal::GCVisitor&);
#endif
};
@@ -97,8 +97,8 @@ public:
SlicedDataPtr getSlicedData() const;
#ifdef ICE_CPP11_MAPPING
- virtual void __write(::Ice::OutputStream*) const override;
- virtual void __read(::Ice::InputStream*) override;
+ virtual void _iceWrite(::Ice::OutputStream*) const override;
+ virtual void _iceRead(::Ice::InputStream*) override;
virtual std::string ice_id() const override;
std::shared_ptr<UnknownSlicedValue> ice_clone() const;
@@ -107,10 +107,10 @@ protected:
virtual std::shared_ptr<Value> cloneImpl() const override;
#else
- virtual void __gcVisitMembers(IceInternal::GCVisitor&);
+ virtual void _iceGcVisitMembers(IceInternal::GCVisitor&);
- virtual void __write(::Ice::OutputStream*) const;
- virtual void __read(::Ice::InputStream*);
+ virtual void _iceWrite(::Ice::OutputStream*) const;
+ virtual void _iceRead(::Ice::InputStream*);
#endif
private:
diff --git a/cpp/include/Ice/Value.h b/cpp/include/Ice/Value.h
index b2c4b4f2b57..411f5661792 100644
--- a/cpp/include/Ice/Value.h
+++ b/cpp/include/Ice/Value.h
@@ -29,8 +29,8 @@ public:
virtual void ice_preMarshal();
virtual void ice_postUnmarshal();
- virtual void __write(Ice::OutputStream*) const;
- virtual void __read(Ice::InputStream*);
+ virtual void _iceWrite(Ice::OutputStream*) const;
+ virtual void _iceRead(Ice::InputStream*);
virtual std::string ice_id() const;
static const std::string& ice_staticId();
@@ -41,8 +41,8 @@ protected:
virtual std::shared_ptr<Value> cloneImpl() const = 0;
- virtual void __writeImpl(Ice::OutputStream*) const {}
- virtual void __readImpl(Ice::InputStream*) {}
+ virtual void _iceWriteImpl(Ice::OutputStream*) const {}
+ virtual void _iceReadImpl(Ice::InputStream*) {}
};
template<typename T, typename Base> class ValueHelper : public Base
@@ -70,20 +70,20 @@ protected:
return std::make_shared<T>(static_cast<const T&>(*this));
}
- virtual void __writeImpl(Ice::OutputStream* os) const override
+ virtual void _iceWriteImpl(Ice::OutputStream* os) const override
{
os->startSlice(T::ice_staticId(), -1, std::is_same<Base, Ice::Value>::value ? true : false);
Ice::StreamWriter<T, Ice::OutputStream>::write(os, static_cast<const T&>(*this));
os->endSlice();
- Base::__writeImpl(os);
+ Base::_iceWriteImpl(os);
}
- virtual void __readImpl(Ice::InputStream* is) override
+ virtual void _iceReadImpl(Ice::InputStream* is) override
{
is->startSlice();
Ice::StreamReader<T, Ice::InputStream>::read(is, static_cast<T&>(*this));
is->endSlice();
- Base::__readImpl(is);
+ Base::_iceReadImpl(is);
}
};
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 23:04:53 +0000