summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/BasicStream.cpp2
-rw-r--r--cpp/src/Ice/Direct.cpp2
-rw-r--r--cpp/src/Ice/Emitter.cpp22
-rw-r--r--cpp/src/Ice/Exception.cpp144
-rw-r--r--cpp/src/Ice/Incoming.cpp6
-rw-r--r--cpp/src/Ice/Object.cpp30
-rw-r--r--cpp/src/Ice/Outgoing.cpp8
-rw-r--r--cpp/src/Ice/Proxy.cpp76
-rw-r--r--cpp/src/Ice/SslException.cpp52
-rw-r--r--cpp/src/Ice/SslException.h40
-rw-r--r--cpp/src/IcePack/AdminI.cpp2
-rw-r--r--cpp/src/IcePack/Forward.cpp2
-rw-r--r--cpp/src/IceUtil/Exception.cpp24
-rw-r--r--cpp/src/slice2cpp/Gen.cpp36
-rw-r--r--cpp/src/slice2java/Gen.cpp22
15 files changed, 234 insertions, 234 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index 0b846e64d31..6d9c67687bf 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -902,7 +902,7 @@ IceInternal::BasicStream::throwException(const char** throwsBegin, const char**
if (binary_search(throwsBegin, throwsEnd, string(*p)))
{
ex.__read(this);
- ex._ice_throw();
+ ex.ice_throw();
}
}
diff --git a/cpp/src/Ice/Direct.cpp b/cpp/src/Ice/Direct.cpp
index cd701864609..9a9a6e9109c 100644
--- a/cpp/src/Ice/Direct.cpp
+++ b/cpp/src/Ice/Direct.cpp
@@ -52,7 +52,7 @@ IceInternal::Direct::Direct(const ObjectAdapterPtr& adapter, const ReferencePtr&
if (_servant && !ref->facet.empty())
{
- _facetServant = _servant->_ice_findFacet(ref->facet);
+ _facetServant = _servant->ice_findFacet(ref->facet);
if (!_facetServant)
{
throw FacetNotExistException(__FILE__, __LINE__);
diff --git a/cpp/src/Ice/Emitter.cpp b/cpp/src/Ice/Emitter.cpp
index 1a9097f73a8..0d7f50d934b 100644
--- a/cpp/src/Ice/Emitter.cpp
+++ b/cpp/src/Ice/Emitter.cpp
@@ -64,7 +64,7 @@ IceInternal::Emitter::sendRequest(Outgoing* out, bool oneway)
if (_exception.get())
{
- _exception->_ice_throw();
+ _exception->ice_throw();
}
assert(_state == StateActive);
@@ -99,7 +99,7 @@ IceInternal::Emitter::sendRequest(Outgoing* out, bool oneway)
catch(const LocalException& ex)
{
setState(StateClosed, ex);
- ex._ice_throw();
+ ex.ice_throw();
}
//
@@ -120,7 +120,7 @@ IceInternal::Emitter::prepareBatchRequest(Outgoing* out)
if (_exception.get())
{
unlock();
- _exception->_ice_throw();
+ _exception->ice_throw();
}
assert(_state == StateActive);
@@ -152,7 +152,7 @@ IceInternal::Emitter::finishBatchRequest(Outgoing* out)
if (_exception.get())
{
unlock();
- _exception->_ice_throw();
+ _exception->ice_throw();
}
assert(_state == StateActive);
@@ -176,7 +176,7 @@ IceInternal::Emitter::flushBatchRequest()
if (_exception.get())
{
- _exception->_ice_throw();
+ _exception->ice_throw();
}
assert(_state == StateActive);
@@ -209,7 +209,7 @@ IceInternal::Emitter::flushBatchRequest()
catch(const LocalException& ex)
{
setState(StateClosed, ex);
- ex._ice_throw();
+ ex.ice_throw();
}
}
@@ -408,7 +408,7 @@ IceInternal::Emitter::setState(State state, const LocalException& ex)
if (!_exception.get())
{
- _exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex._ice_clone()));
+ _exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.ice_clone()));
}
for (std::map< ::Ice::Int, Outgoing*>::iterator p = _requests.begin(); p != _requests.end(); ++p)
@@ -490,15 +490,15 @@ IceInternal::EmitterFactory::create(const vector<EndpointPtr>& endpoints)
}
catch (const SocketException& ex)
{
- exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex._ice_clone()));
+ exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.ice_clone()));
}
catch (const DNSException& ex)
{
- exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex._ice_clone()));
+ exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.ice_clone()));
}
catch (const TimeoutException& ex)
{
- exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex._ice_clone()));
+ exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.ice_clone()));
}
++q;
@@ -523,7 +523,7 @@ IceInternal::EmitterFactory::create(const vector<EndpointPtr>& endpoints)
if (!emitter)
{
assert(exception.get());
- exception->_ice_throw();
+ exception->ice_throw();
}
return emitter;
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index 1b1ee004992..fae01eb0724 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -21,121 +21,121 @@ Ice::LocalException::LocalException(const char* file, int line) :
}
void
-Ice::UnknownLocalException::_ice_print(ostream& out) const
+Ice::UnknownLocalException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nunknown local exception";
}
void
-Ice::UnknownUserException::_ice_print(ostream& out) const
+Ice::UnknownUserException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nunknown user exception";
}
void
-Ice::UnknownException::_ice_print(ostream& out) const
+Ice::UnknownException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nunknown C++ exception";
}
void
-Ice::VersionMismatchException::_ice_print(ostream& out) const
+Ice::VersionMismatchException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nIce library version mismatch";
}
void
-Ice::CommunicatorDestroyedException::_ice_print(ostream& out) const
+Ice::CommunicatorDestroyedException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\ncommunicator object destroyed";
}
void
-Ice::ObjectAdapterDeactivatedException::_ice_print(ostream& out) const
+Ice::ObjectAdapterDeactivatedException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nobject adapter deactivated";
}
void
-Ice::NoEndpointException::_ice_print(ostream& out) const
+Ice::NoEndpointException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nno suitable endpoint available";
}
void
-Ice::EndpointParseException::_ice_print(ostream& out) const
+Ice::EndpointParseException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nerror while parsing endpoint";
}
void
-Ice::ReferenceParseException::_ice_print(ostream& out) const
+Ice::ReferenceParseException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nerror while parsing reference";
}
void
-Ice::ReferenceIdentityException::_ice_print(ostream& out) const
+Ice::ReferenceIdentityException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nreference identity mismatch in location forward";
}
void
-Ice::ObjectNotExistException::_ice_print(ostream& out) const
+Ice::ObjectNotExistException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nobject does not exist";
}
void
-Ice::FacetNotExistException::_ice_print(ostream& out) const
+Ice::FacetNotExistException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nfacet does not exist";
}
void
-Ice::OperationNotExistException::_ice_print(ostream& out) const
+Ice::OperationNotExistException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\noperation does not exist";
}
void
-Ice::SystemException::_ice_print(ostream& out) const
+Ice::SystemException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nsystem exception: " << errorToString(error);
}
void
-Ice::SocketException::_ice_print(ostream& out) const
+Ice::SocketException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nsocket exception: " << errorToString(error);
}
void
-Ice::ConnectFailedException::_ice_print(ostream& out) const
+Ice::ConnectFailedException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nconnect failed: " << errorToString(error);
}
void
-Ice::ConnectionLostException::_ice_print(ostream& out) const
+Ice::ConnectionLostException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nconnection lost: ";
if (error == 0)
{
@@ -148,134 +148,134 @@ Ice::ConnectionLostException::_ice_print(ostream& out) const
}
void
-Ice::DNSException::_ice_print(ostream& out) const
+Ice::DNSException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nDNS error: " << errorToStringDNS(error);
}
void
-Ice::TimeoutException::_ice_print(ostream& out) const
+Ice::TimeoutException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\ntimeout while sending or receiving data";
}
void
-Ice::ConnectTimeoutException::_ice_print(ostream& out) const
+Ice::ConnectTimeoutException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\ntimeout while establishing a connection";
}
void
-Ice::ProtocolException::_ice_print(ostream& out) const
+Ice::ProtocolException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nunknown protocol exception";
}
void
-Ice::UnmarshalOutOfBoundsException::_ice_print(ostream& out) const
+Ice::UnmarshalOutOfBoundsException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nprotocol error: out of bounds during unmarshaling";
}
void
-Ice::NoObjectFactoryException::_ice_print(ostream& out) const
+Ice::NoObjectFactoryException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nprotocol error: no suitable object factory found";
}
void
-Ice::NoUserExceptionFactoryException::_ice_print(ostream& out) const
+Ice::NoUserExceptionFactoryException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nprotocol error: no suitable user exception factory found";
}
void
-Ice::ProxyUnmarshalException::_ice_print(ostream& out) const
+Ice::ProxyUnmarshalException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nprotocol error: inconsistent proxy data during unmarshaling";
}
void
-Ice::IllegalIndirectionException::_ice_print(ostream& out) const
+Ice::IllegalIndirectionException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nprotocol error: encountered illegal protocol indirection";
}
void
-Ice::MemoryLimitException::_ice_print(ostream& out) const
+Ice::MemoryLimitException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nprotocol error: memory limit exceeded";
}
void
-Ice::EncapsulationException::_ice_print(ostream& out) const
+Ice::EncapsulationException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nprotocol error: illegal encapsulation";
}
void
-Ice::UnsupportedProtocolException::_ice_print(ostream& out) const
+Ice::UnsupportedProtocolException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nprotocol error: unsupported protocol version";
}
void
-Ice::UnsupportedEncodingException::_ice_print(ostream& out) const
+Ice::UnsupportedEncodingException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nprotocol error: unsupported encoding version";
}
void
-Ice::InvalidMessageException::_ice_print(ostream& out) const
+Ice::InvalidMessageException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nprotocol error: invalid message type";
}
void
-Ice::UnknownMessageException::_ice_print(ostream& out) const
+Ice::UnknownMessageException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nprotocol error: unknown message type";
}
void
-Ice::UnknownRequestIdException::_ice_print(ostream& out) const
+Ice::UnknownRequestIdException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nprotocol error: unknown request id";
}
void
-Ice::UnknownReplyStatusException::_ice_print(ostream& out) const
+Ice::UnknownReplyStatusException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nprotocol error: unknown reply status";
}
void
-Ice::CloseConnectionException::_ice_print(ostream& out) const
+Ice::CloseConnectionException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nprotocol error: connection closed by server";
}
void
-Ice::AbortBatchRequestException::_ice_print(ostream& out) const
+Ice::AbortBatchRequestException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nprotocol error: batch request was aborted";
}
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index b57b30f3d62..de562b7c361 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -80,7 +80,7 @@ IceInternal::Incoming::invoke(BasicStream& is)
{
if (!facet.empty())
{
- ObjectPtr facetServant = servant->_ice_findFacet(facet);
+ ObjectPtr facetServant = servant->ice_findFacet(facet);
if (!facetServant)
{
_os.write(static_cast<Byte>(DispatchFacetNotExist));
@@ -124,7 +124,7 @@ IceInternal::Incoming::invoke(BasicStream& is)
}
_os.b.resize(statusPos);
_os.write(static_cast<Byte>(DispatchUnknownLocalException));
- ex._ice_throw();
+ ex.ice_throw();
}
catch (const UserException& ex)
{
@@ -134,7 +134,7 @@ IceInternal::Incoming::invoke(BasicStream& is)
}
_os.b.resize(statusPos);
_os.write(static_cast<Byte>(DispatchUnknownUserException));
- ex._ice_throw();
+ ex.ice_throw();
}
catch (...)
{
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index 5a0bfdbeda3..9c8d3e3ebf7 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -46,46 +46,46 @@ Ice::Object::operator<(const Object& r) const
}
Int
-Ice::Object::_ice_hash() const
+Ice::Object::ice_hash() const
{
return reinterpret_cast<Int>(this);
}
bool
-Ice::Object::_ice_isA(const string& s)
+Ice::Object::ice_isA(const string& s)
{
return s == "::Ice::Object";
}
void
-Ice::Object::_ice_ping()
+Ice::Object::ice_ping()
{
// Nothing to do.
}
DispatchStatus
-Ice::Object::____ice_isA(Incoming& __in)
+Ice::Object::___ice_isA(Incoming& __in)
{
BasicStream* __is = __in.is();
BasicStream* __os = __in.os();
string s;
__is->read(s);
- bool __ret = _ice_isA(s);
+ bool __ret = ice_isA(s);
__os->write(__ret);
return DispatchOK;
}
DispatchStatus
-Ice::Object::____ice_ping(Incoming&)
+Ice::Object::___ice_ping(Incoming&)
{
- _ice_ping();
+ ice_ping();
return DispatchOK;
}
const char* Ice::Object::__all[] =
{
- "_ice_isA"
- "_ice_ping"
+ "ice_isA"
+ "ice_ping"
};
DispatchStatus
@@ -103,11 +103,11 @@ Ice::Object::__dispatch(Incoming& in, const string& s)
{
case 0:
{
- return ____ice_isA(in);
+ return ___ice_isA(in);
}
case 1:
{
- return ____ice_ping(in);
+ return ___ice_ping(in);
}
}
@@ -159,7 +159,7 @@ Ice::Object::__read(::IceInternal::BasicStream* __is)
}
void
-Ice::Object::_ice_addFacet(const ObjectPtr& facet, const string& name)
+Ice::Object::ice_addFacet(const ObjectPtr& facet, const string& name)
{
JTCSyncT<JTCMutex> sync(_activeFacetMapMutex);
@@ -167,7 +167,7 @@ Ice::Object::_ice_addFacet(const ObjectPtr& facet, const string& name)
}
void
-Ice::Object::_ice_removeFacet(const string& name)
+Ice::Object::ice_removeFacet(const string& name)
{
JTCSyncT<JTCMutex> sync(_activeFacetMapMutex);
@@ -194,7 +194,7 @@ Ice::Object::_ice_removeFacet(const string& name)
}
void
-Ice::Object::_ice_removeAllFacets()
+Ice::Object::ice_removeAllFacets()
{
JTCSyncT<JTCMutex> sync(_activeFacetMapMutex);
@@ -203,7 +203,7 @@ Ice::Object::_ice_removeAllFacets()
}
ObjectPtr
-Ice::Object::_ice_findFacet(const string& name)
+Ice::Object::ice_findFacet(const string& name)
{
JTCSyncT<JTCMutex> sync(_activeFacetMapMutex);
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp
index dc2538e2e57..ec2134cd945 100644
--- a/cpp/src/Ice/Outgoing.cpp
+++ b/cpp/src/Ice/Outgoing.cpp
@@ -20,12 +20,12 @@ using namespace IceInternal;
IceInternal::NonRepeatable::NonRepeatable(const NonRepeatable& ex)
{
- _ex = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.get()->_ice_clone()));
+ _ex = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.get()->ice_clone()));
}
IceInternal::NonRepeatable::NonRepeatable(const ::Ice::LocalException& ex)
{
- _ex = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex._ice_clone()));
+ _ex = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.ice_clone()));
}
const ::Ice::LocalException*
@@ -135,7 +135,7 @@ IceInternal::Outgoing::invoke()
//
if(dynamic_cast<const CloseConnectionException*>(_exception.get()))
{
- _exception->_ice_throw();
+ _exception->ice_throw();
}
//
@@ -273,7 +273,7 @@ IceInternal::Outgoing::finished(const LocalException& ex)
if (_state == StateInProgress)
{
_state = StateLocalException;
- _exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex._ice_clone()));
+ _exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.ice_clone()));
notify();
}
}
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 18f71b1f0be..0d83cbfa204 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -45,19 +45,19 @@ IceInternal::checkedCast(const ObjectPrx& b, const string& f, ObjectPrx& d)
d = 0;
if (b)
{
- if (f == b->_ice_getFacet())
+ if (f == b->ice_getFacet())
{
d = b;
}
else
{
- ObjectPrx bb = b->_ice_newFacet(f);
+ ObjectPrx bb = b->ice_newFacet(f);
try
{
#ifdef NDEBUG
- bb->_ice_isA("::Ice::Object");
+ bb->ice_isA("::Ice::Object");
#else
- bool ok = bb->_ice_isA("::Ice::Object");
+ bool ok = bb->ice_isA("::Ice::Object");
assert(ok);
#endif
d = bb;
@@ -75,7 +75,7 @@ IceInternal::uncheckedCast(const ObjectPrx& b, const string& f, ObjectPrx& d)
d = 0;
if (b)
{
- d = b->_ice_newFacet(f);
+ d = b->ice_newFacet(f);
}
}
@@ -92,12 +92,12 @@ IceProxy::Ice::Object::operator<(const Object& r) const
}
Int
-IceProxy::Ice::Object::_ice_hash() const
+IceProxy::Ice::Object::ice_hash() const
{
return _reference->hashValue;
}
bool
-IceProxy::Ice::Object::_ice_isA(const string& s)
+IceProxy::Ice::Object::ice_isA(const string& s)
{
int __cnt = 0;
while (true)
@@ -105,7 +105,7 @@ IceProxy::Ice::Object::_ice_isA(const string& s)
try
{
Handle< ::IceDelegate::Ice::Object> __del = __getDelegate();
- return __del->_ice_isA(s);
+ return __del->ice_isA(s);
}
catch (const LocationForward& __ex)
{
@@ -123,7 +123,7 @@ IceProxy::Ice::Object::_ice_isA(const string& s)
}
void
-IceProxy::Ice::Object::_ice_ping()
+IceProxy::Ice::Object::ice_ping()
{
int __cnt = 0;
while (true)
@@ -131,7 +131,7 @@ IceProxy::Ice::Object::_ice_ping()
try
{
Handle< ::IceDelegate::Ice::Object> __del = __getDelegate();
- __del->_ice_ping();
+ __del->ice_ping();
return;
}
catch (const LocationForward& __ex)
@@ -150,13 +150,13 @@ IceProxy::Ice::Object::_ice_ping()
}
std::string
-IceProxy::Ice::Object::_ice_getIdentity() const
+IceProxy::Ice::Object::ice_getIdentity() const
{
return _reference->identity;
}
ObjectPrx
-IceProxy::Ice::Object::_ice_newIdentity(const std::string& newIdentity) const
+IceProxy::Ice::Object::ice_newIdentity(const std::string& newIdentity) const
{
if (newIdentity == _reference->identity)
{
@@ -171,13 +171,13 @@ IceProxy::Ice::Object::_ice_newIdentity(const std::string& newIdentity) const
}
std::string
-IceProxy::Ice::Object::_ice_getFacet() const
+IceProxy::Ice::Object::ice_getFacet() const
{
return _reference->facet;
}
ObjectPrx
-IceProxy::Ice::Object::_ice_newFacet(const std::string& newFacet) const
+IceProxy::Ice::Object::ice_newFacet(const std::string& newFacet) const
{
if (newFacet == _reference->facet)
{
@@ -192,7 +192,7 @@ IceProxy::Ice::Object::_ice_newFacet(const std::string& newFacet) const
}
ObjectPrx
-IceProxy::Ice::Object::_ice_twoway() const
+IceProxy::Ice::Object::ice_twoway() const
{
ReferencePtr ref = _reference->changeMode(Reference::ModeTwoway);
if (ref == _reference)
@@ -208,7 +208,7 @@ IceProxy::Ice::Object::_ice_twoway() const
}
ObjectPrx
-IceProxy::Ice::Object::_ice_oneway() const
+IceProxy::Ice::Object::ice_oneway() const
{
ReferencePtr ref = _reference->changeMode(Reference::ModeOneway);
if (ref == _reference)
@@ -224,7 +224,7 @@ IceProxy::Ice::Object::_ice_oneway() const
}
ObjectPrx
-IceProxy::Ice::Object::_ice_batchOneway() const
+IceProxy::Ice::Object::ice_batchOneway() const
{
ReferencePtr ref = _reference->changeMode(Reference::ModeBatchOneway);
if (ref == _reference)
@@ -240,7 +240,7 @@ IceProxy::Ice::Object::_ice_batchOneway() const
}
ObjectPrx
-IceProxy::Ice::Object::_ice_datagram() const
+IceProxy::Ice::Object::ice_datagram() const
{
ReferencePtr ref = _reference->changeMode(Reference::ModeDatagram);
if (ref == _reference)
@@ -256,7 +256,7 @@ IceProxy::Ice::Object::_ice_datagram() const
}
ObjectPrx
-IceProxy::Ice::Object::_ice_batchDatagram() const
+IceProxy::Ice::Object::ice_batchDatagram() const
{
ReferencePtr ref = _reference->changeMode(Reference::ModeBatchDatagram);
if (ref == _reference)
@@ -272,7 +272,7 @@ IceProxy::Ice::Object::_ice_batchDatagram() const
}
ObjectPrx
-IceProxy::Ice::Object::_ice_secure(bool b) const
+IceProxy::Ice::Object::ice_secure(bool b) const
{
ReferencePtr ref = _reference->changeSecure(b);
if (ref == _reference)
@@ -288,7 +288,7 @@ IceProxy::Ice::Object::_ice_secure(bool b) const
}
ObjectPrx
-IceProxy::Ice::Object::_ice_timeout(int t) const
+IceProxy::Ice::Object::ice_timeout(int t) const
{
ReferencePtr ref = _reference->changeTimeout(t);
if (ref == _reference)
@@ -304,10 +304,10 @@ IceProxy::Ice::Object::_ice_timeout(int t) const
}
void
-IceProxy::Ice::Object::_ice_flush()
+IceProxy::Ice::Object::ice_flush()
{
Handle< ::IceDelegate::Ice::Object> __del = __getDelegate();
- __del->_ice_flush();
+ __del->ice_flush();
}
ReferencePtr
@@ -333,7 +333,7 @@ IceProxy::Ice::Object::__handleException(const LocalException& ex, int& cnt)
try
{
- ex._ice_throw();
+ ex.ice_throw();
}
catch (const CloseConnectionException&)
{
@@ -367,7 +367,7 @@ IceProxy::Ice::Object::__handleException(const LocalException& ex, int& cnt)
s << "cannot retry operation call because retry limit has been exceeded\n" << ex;
logger->trace(traceLevels->retryCat, s.str());
}
- ex._ice_throw();
+ ex.ice_throw();
}
if (traceLevels->retry >= 1)
@@ -417,7 +417,7 @@ IceProxy::Ice::Object::__rethrowException(const LocalException& ex)
_delegate = 0;
- ex._ice_throw();
+ ex.ice_throw();
}
Handle< ::IceDelegate::Ice::Object>
@@ -467,12 +467,12 @@ IceProxy::Ice::Object::setup(const ReferencePtr& ref)
}
bool
-IceDelegateM::Ice::Object::_ice_isA(const string& s)
+IceDelegateM::Ice::Object::ice_isA(const string& s)
{
Outgoing __out(__emitter, __reference);
BasicStream* __is = __out.is();
BasicStream* __os = __out.os();
- __os->write("_ice_isA");
+ __os->write("ice_isA");
__os->write(s);
if (!__out.invoke())
{
@@ -484,11 +484,11 @@ IceDelegateM::Ice::Object::_ice_isA(const string& s)
}
void
-IceDelegateM::Ice::Object::_ice_ping()
+IceDelegateM::Ice::Object::ice_ping()
{
Outgoing __out(__emitter, __reference);
BasicStream* __os = __out.os();
- __os->write("_ice_ping");
+ __os->write("ice_ping");
if (!__out.invoke())
{
throw ::Ice::UnknownUserException(__FILE__, __LINE__);
@@ -496,7 +496,7 @@ IceDelegateM::Ice::Object::_ice_ping()
}
void
-IceDelegateM::Ice::Object::_ice_flush()
+IceDelegateM::Ice::Object::ice_flush()
{
__emitter->flushBatchRequest();
}
@@ -555,21 +555,21 @@ IceDelegateM::Ice::Object::setup(const ReferencePtr& ref)
}
bool
-IceDelegateD::Ice::Object::_ice_isA(const string& s)
+IceDelegateD::Ice::Object::ice_isA(const string& s)
{
- Direct __direct(__adapter, __reference, "_ice_isA");
- return __direct.facetServant()->_ice_isA(s);
+ Direct __direct(__adapter, __reference, "ice_isA");
+ return __direct.facetServant()->ice_isA(s);
}
void
-IceDelegateD::Ice::Object::_ice_ping()
+IceDelegateD::Ice::Object::ice_ping()
{
- Direct __direct(__adapter, __reference, "_ice_ping");
- __direct.facetServant()->_ice_ping();
+ Direct __direct(__adapter, __reference, "ice_ping");
+ __direct.facetServant()->ice_ping();
}
void
-IceDelegateD::Ice::Object::_ice_flush()
+IceDelegateD::Ice::Object::ice_flush()
{
// Nothing to do for direct delegates
}
diff --git a/cpp/src/Ice/SslException.cpp b/cpp/src/Ice/SslException.cpp
index edca53e1cfc..91cea56a22a 100644
--- a/cpp/src/Ice/SslException.cpp
+++ b/cpp/src/Ice/SslException.cpp
@@ -48,7 +48,7 @@ IceSecurity::SecurityException::operator=(const SecurityException& ex)
string
IceSecurity::SecurityException::toString() const
{
- string s = _ice_name();
+ string s = ice_name();
if (_message == "")
{
@@ -64,26 +64,26 @@ IceSecurity::SecurityException::toString() const
}
string
-IceSecurity::SecurityException::_ice_name() const
+IceSecurity::SecurityException::ice_name() const
{
return "IceSecurity::SecurityException";
}
void
-IceSecurity::SecurityException::_ice_print(ostream& out) const
+IceSecurity::SecurityException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nunknown security exception";
}
Ice::Exception*
-IceSecurity::SecurityException::_ice_clone() const
+IceSecurity::SecurityException::ice_clone() const
{
return new SecurityException(*this);
}
void
-IceSecurity::SecurityException::_ice_throw() const
+IceSecurity::SecurityException::ice_throw() const
{
throw *this;
}
@@ -114,26 +114,26 @@ IceSecurity::Ssl::InitException::operator=(const InitException& ex)
}
string
-IceSecurity::Ssl::InitException::_ice_name() const
+IceSecurity::Ssl::InitException::ice_name() const
{
return "IceSecurity::InitException";
}
void
-IceSecurity::Ssl::InitException::_ice_print(ostream& out) const
+IceSecurity::Ssl::InitException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nsecurity system initialization exception";
}
Ice::Exception*
-IceSecurity::Ssl::InitException::_ice_clone() const
+IceSecurity::Ssl::InitException::ice_clone() const
{
return new InitException(*this);
}
void
-IceSecurity::Ssl::InitException::_ice_throw() const
+IceSecurity::Ssl::InitException::ice_throw() const
{
throw *this;
}
@@ -164,26 +164,26 @@ IceSecurity::Ssl::ReInitException::operator=(const ReInitException& ex)
}
string
-IceSecurity::Ssl::ReInitException::_ice_name() const
+IceSecurity::Ssl::ReInitException::ice_name() const
{
return "IceSecurity::ReInitException";
}
void
-IceSecurity::Ssl::ReInitException::_ice_print(ostream& out) const
+IceSecurity::Ssl::ReInitException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nsecurity system re-initialization exception";
}
Ice::Exception*
-IceSecurity::Ssl::ReInitException::_ice_clone() const
+IceSecurity::Ssl::ReInitException::ice_clone() const
{
return new ReInitException(*this);
}
void
-IceSecurity::Ssl::ReInitException::_ice_throw() const
+IceSecurity::Ssl::ReInitException::ice_throw() const
{
throw *this;
}
@@ -214,26 +214,26 @@ IceSecurity::Ssl::ShutdownException::operator=(const ShutdownException& ex)
}
string
-IceSecurity::Ssl::ShutdownException::_ice_name() const
+IceSecurity::Ssl::ShutdownException::ice_name() const
{
return "IceSecurity::ShutdownException";
}
void
-IceSecurity::Ssl::ShutdownException::_ice_print(ostream& out) const
+IceSecurity::Ssl::ShutdownException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nsecurity system shutdown exception";
}
Ice::Exception*
-IceSecurity::Ssl::ShutdownException::_ice_clone() const
+IceSecurity::Ssl::ShutdownException::ice_clone() const
{
return new ShutdownException(*this);
}
void
-IceSecurity::Ssl::ShutdownException::_ice_throw() const
+IceSecurity::Ssl::ShutdownException::ice_throw() const
{
throw *this;
}
@@ -264,26 +264,26 @@ IceSecurity::Ssl::OpenSSL::ContextException::operator=(const ContextException& e
}
string
-IceSecurity::Ssl::OpenSSL::ContextException::_ice_name() const
+IceSecurity::Ssl::OpenSSL::ContextException::ice_name() const
{
return "IceSecurity::ContextException";
}
void
-IceSecurity::Ssl::OpenSSL::ContextException::_ice_print(ostream& out) const
+IceSecurity::Ssl::OpenSSL::ContextException::ice_print(ostream& out) const
{
- Exception::_ice_print(out);
+ Exception::ice_print(out);
out << ":\nSSL System context exception";
}
Ice::Exception*
-IceSecurity::Ssl::OpenSSL::ContextException::_ice_clone() const
+IceSecurity::Ssl::OpenSSL::ContextException::ice_clone() const
{
return new ContextException(*this);
}
void
-IceSecurity::Ssl::OpenSSL::ContextException::_ice_throw() const
+IceSecurity::Ssl::OpenSSL::ContextException::ice_throw() const
{
throw *this;
}
diff --git a/cpp/src/Ice/SslException.h b/cpp/src/Ice/SslException.h
index 0f17712141f..651a2330605 100644
--- a/cpp/src/Ice/SslException.h
+++ b/cpp/src/Ice/SslException.h
@@ -36,10 +36,10 @@ public:
SecurityException(const SecurityException&);
SecurityException& operator=(const SecurityException&);
virtual string toString() const;
- virtual string _ice_name() const;
- virtual void _ice_print(std::ostream&) const;
- virtual Exception* _ice_clone() const;
- virtual void _ice_throw() const;
+ virtual string ice_name() const;
+ virtual void ice_print(std::ostream&) const;
+ virtual Exception* ice_clone() const;
+ virtual void ice_throw() const;
private:
@@ -61,10 +61,10 @@ public:
InitException(const char*, const char*, int);
InitException(const InitException&);
InitException& operator=(const InitException&);
- virtual string _ice_name() const;
- virtual void _ice_print(std::ostream&) const;
- virtual Exception* _ice_clone() const;
- virtual void _ice_throw() const;
+ virtual string ice_name() const;
+ virtual void ice_print(std::ostream&) const;
+ virtual Exception* ice_clone() const;
+ virtual void ice_throw() const;
};
@@ -80,10 +80,10 @@ public:
ReInitException(const char*, const char*, int);
ReInitException(const ReInitException&);
ReInitException& operator=(const ReInitException&);
- virtual string _ice_name() const;
- virtual void _ice_print(std::ostream&) const;
- virtual Exception* _ice_clone() const;
- virtual void _ice_throw() const;
+ virtual string ice_name() const;
+ virtual void ice_print(std::ostream&) const;
+ virtual Exception* ice_clone() const;
+ virtual void ice_throw() const;
};
@@ -100,10 +100,10 @@ public:
ShutdownException(const char*, const char*, int);
ShutdownException(const ShutdownException&);
ShutdownException& operator=(const ShutdownException&);
- virtual string _ice_name() const;
- virtual void _ice_print(std::ostream&) const;
- virtual Exception* _ice_clone() const;
- virtual void _ice_throw() const;
+ virtual string ice_name() const;
+ virtual void ice_print(std::ostream&) const;
+ virtual Exception* ice_clone() const;
+ virtual void ice_throw() const;
};
@@ -122,10 +122,10 @@ public:
ContextException(const char*, const char*, int);
ContextException(const ContextException&);
ContextException& operator=(const ContextException&);
- virtual string _ice_name() const;
- virtual void _ice_print(std::ostream&) const;
- virtual Exception* _ice_clone() const;
- virtual void _ice_throw() const;
+ virtual string ice_name() const;
+ virtual void ice_print(std::ostream&) const;
+ virtual Exception* ice_clone() const;
+ virtual void ice_throw() const;
};
diff --git a/cpp/src/IcePack/AdminI.cpp b/cpp/src/IcePack/AdminI.cpp
index 0a0408c7fcf..1ae545560bd 100644
--- a/cpp/src/IcePack/AdminI.cpp
+++ b/cpp/src/IcePack/AdminI.cpp
@@ -27,7 +27,7 @@ IcePack::AdminI::add(const ServerDescription& desc)
if (desc.object)
{
- _serverDescriptions[desc.object->_ice_getIdentity()] = desc;
+ _serverDescriptions[desc.object->ice_getIdentity()] = desc;
}
}
diff --git a/cpp/src/IcePack/Forward.cpp b/cpp/src/IcePack/Forward.cpp
index 4235ff0083b..18a712d39ce 100644
--- a/cpp/src/IcePack/Forward.cpp
+++ b/cpp/src/IcePack/Forward.cpp
@@ -110,7 +110,7 @@ IcePack::Forward::locate(const ObjectAdapterPtr& adapter, const string& ident, c
// server timeout, a crash, or an explicit
// shutdown method.
//
- desc.object->_ice_ping();
+ desc.object->ice_ping();
//
// Everything ok, the server is now up and
diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/Exception.cpp
index 1f7a678a7ee..3f24f1d0001 100644
--- a/cpp/src/IceUtil/Exception.cpp
+++ b/cpp/src/IceUtil/Exception.cpp
@@ -29,41 +29,41 @@ IceUtil::Exception::~Exception()
}
string
-IceUtil::Exception::_ice_name() const
+IceUtil::Exception::ice_name() const
{
return "IceUtil::Exception";
}
void
-IceUtil::Exception::_ice_print(ostream& out) const
+IceUtil::Exception::ice_print(ostream& out) const
{
if (_file && _line > 0)
{
out << _file << ':' << _line << ": ";
}
- out << _ice_name();
+ out << ice_name();
}
IceUtil::Exception*
-IceUtil::Exception::_ice_clone() const
+IceUtil::Exception::ice_clone() const
{
return new Exception(*this);
}
void
-IceUtil::Exception::_ice_throw() const
+IceUtil::Exception::ice_throw() const
{
throw *this;
}
const char*
-IceUtil::Exception::_ice_file() const
+IceUtil::Exception::ice_file() const
{
return _file;
}
int
-IceUtil::Exception::_ice_line() const
+IceUtil::Exception::ice_line() const
{
return _line;
}
@@ -71,7 +71,7 @@ IceUtil::Exception::_ice_line() const
ostream&
IceUtil::operator<<(ostream& out, const IceUtil::Exception& ex)
{
- ex._ice_print(out);
+ ex.ice_print(out);
return out;
}
@@ -81,25 +81,25 @@ IceUtil::NullHandleException::NullHandleException(const char* file, int line) :
}
string
-IceUtil::NullHandleException::_ice_name() const
+IceUtil::NullHandleException::ice_name() const
{
return "IceUtil::NullHandleException";
}
string
-IceUtil::NullHandleException::_ice_description() const
+IceUtil::NullHandleException::ice_description() const
{
return "operation call on null handle";
}
IceUtil::Exception*
-IceUtil::NullHandleException::_ice_clone() const
+IceUtil::NullHandleException::ice_clone() const
{
return new NullHandleException(*this);
}
void
-IceUtil::NullHandleException::_ice_throw() const
+IceUtil::NullHandleException::ice_throw() const
{
throw *this;
}
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index b9822da41ea..21ced3c458c 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -243,25 +243,25 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
C << eb;
}
- H << nl << _dllExport << "virtual ::std::string _ice_name() const;";
- C << sp << nl << "::std::string" << nl << scoped.substr(2) << "::_ice_name() const";
+ H << nl << _dllExport << "virtual ::std::string ice_name() const;";
+ C << sp << nl << "::std::string" << nl << scoped.substr(2) << "::ice_name() const";
C << sb;
C << nl << "return \"" << scoped.substr(2) << "\";";
C << eb;
if (p->isLocal())
{
- H << nl << _dllExport << "virtual void _ice_print(::std::ostream&) const;";
+ H << nl << _dllExport << "virtual void ice_print(::std::ostream&) const;";
}
- H << nl << _dllExport << "virtual ::Ice::Exception* _ice_clone() const;";
- C << sp << nl << "::Ice::Exception*" << nl << scoped.substr(2) << "::_ice_clone() const";
+ H << nl << _dllExport << "virtual ::Ice::Exception* ice_clone() const;";
+ C << sp << nl << "::Ice::Exception*" << nl << scoped.substr(2) << "::ice_clone() const";
C << sb;
C << nl << "return new " << name << "(*this);";
C << eb;
- H << nl << _dllExport << "virtual void _ice_throw() const;";
- C << sp << nl << "void" << nl << scoped.substr(2) << "::_ice_throw() const";
+ H << nl << _dllExport << "virtual void ice_throw() const;";
+ C << sp << nl << "void" << nl << scoped.substr(2) << "::ice_throw() const";
C << sb;
C << nl << "throw *this;";
C << eb;
@@ -1540,7 +1540,7 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
H << sp;
H << nl << exp2 << "static const char* __ids[" << ids.size() << "];";
H << nl << exp2 << "static const char* __classIds[" << classIds.size() << "];";
- H << nl << exp2 << "virtual bool _ice_isA(const ::std::string&);";
+ H << nl << exp2 << "virtual bool ice_isA(const ::std::string&);";
H << nl << exp2 << "virtual const char** __getClassIds();";
C << sp;
C << nl << "const char* " << scoped.substr(2) << "::__ids[" << ids.size() << "] =";
@@ -1569,7 +1569,7 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
}
C << eb << ';';
C << sp;
- C << nl << "bool" << nl << scoped.substr(2) << "::_ice_isA(const ::std::string& s)";
+ C << nl << "bool" << nl << scoped.substr(2) << "::ice_isA(const ::std::string& s)";
C << sb;
C << nl << "const char** b = __ids;";
C << nl << "const char** e = __ids + " << ids.size() << ';';
@@ -1614,8 +1614,8 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
{
StringList allOpNames;
transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), ::IceUtil::memFun(&Operation::name));
- allOpNames.push_back("_ice_isA");
- allOpNames.push_back("_ice_ping");
+ allOpNames.push_back("ice_isA");
+ allOpNames.push_back("ice_ping");
allOpNames.sort();
allOpNames.unique();
@@ -1625,7 +1625,7 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
StringList allMutatingOpNames;
transform(allMutatingOps.begin(), allMutatingOps.end(), back_inserter(allMutatingOpNames),
::IceUtil::memFun(&Operation::name));
- // Don't add _ice_isA and _ice_ping. These operations are non-mutating.
+ // Don't add ice_isA and ice_ping. These operations are non-mutating.
allMutatingOpNames.sort();
allMutatingOpNames.unique();
@@ -2018,10 +2018,10 @@ Slice::Gen::IceVisitor::visitClassDefStart(const ClassDefPtr& p)
C << nl << "d = 0;";
C << nl << "if (b)";
C << sb;
- C << nl << "if (f == b->_ice_getFacet())";
+ C << nl << "if (f == b->ice_getFacet())";
C << sb;
C << nl << "d = dynamic_cast< ::IceProxy" << scoped << "*>(b.get());";
- C << nl << "if (!d && b->_ice_isA(\"" << scoped << "\"))";
+ C << nl << "if (!d && b->ice_isA(\"" << scoped << "\"))";
C << sb;
C << nl << "d = new ::IceProxy" << scoped << ";";
C << nl << "d->__copyFrom(b);";
@@ -2029,10 +2029,10 @@ Slice::Gen::IceVisitor::visitClassDefStart(const ClassDefPtr& p)
C << eb;
C << nl << "else";
C << sb;
- C << nl << "::Ice::ObjectPrx bb = b->_ice_newFacet(f);";
+ C << nl << "::Ice::ObjectPrx bb = b->ice_newFacet(f);";
C << nl << "try";
C << sb;
- C << nl << "if (bb->_ice_isA(\"" << scoped << "\"))";
+ C << nl << "if (bb->ice_isA(\"" << scoped << "\"))";
C << sb;
C << nl << "d = new ::IceProxy" << scoped << ";";
C << nl << "d->__copyFrom(bb);";
@@ -2051,7 +2051,7 @@ Slice::Gen::IceVisitor::visitClassDefStart(const ClassDefPtr& p)
C << nl << "d = 0;";
C << nl << "if (b)";
C << sb;
- C << nl << "if (f == b->_ice_getFacet())";
+ C << nl << "if (f == b->ice_getFacet())";
C << sb;
C << nl << "d = dynamic_cast< ::IceProxy" << scoped << "*>(b.get());";
C << nl << "if (!d)";
@@ -2062,7 +2062,7 @@ Slice::Gen::IceVisitor::visitClassDefStart(const ClassDefPtr& p)
C << eb;
C << nl << "else";
C << sb;
- C << nl << "::Ice::ObjectPrx bb = b->_ice_newFacet(f);";
+ C << nl << "::Ice::ObjectPrx bb = b->ice_newFacet(f);";
C << nl << "d = new ::IceProxy" << scoped << ";";
C << nl << "d->__copyFrom(bb);";
C << eb;
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 9d886db4d98..09cc50b064f 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -1101,23 +1101,23 @@ Slice::Gen::HelperVisitor::visitEnum(const EnumPtr& p)
// write
//
out << sp << nl << "public static void" << nl
- << "write(Ice.Stream _ice_os, " << name << " _ice_v)";
+ << "write(Ice.Stream ice_os, " << name << " ice_v)";
out << sb;
if (sz <= 0x7f)
{
- out << nl << "_ice_os.writeByte((byte)_ice_v.value());";
+ out << nl << "ice_os.writeByte((byte)ice_v.value());";
}
else if (sz <= 0x7fff)
{
- out << nl << "_ice_os.writeShort((short)_ice_v.value());";
+ out << nl << "ice_os.writeShort((short)ice_v.value());";
}
else if (sz <= 0x7fffffff)
{
- out << nl << "_ice_os.writeInt((int)_ice_v.value());";
+ out << nl << "ice_os.writeInt((int)ice_v.value());";
}
else
{
- out << nl << "_ice_os.writeLong(_ice_v.value());";
+ out << nl << "ice_os.writeLong(ice_v.value());";
}
out << eb;
@@ -1125,25 +1125,25 @@ Slice::Gen::HelperVisitor::visitEnum(const EnumPtr& p)
// read
//
out << sp << nl << "public static " << name << nl
- << "read(Ice.Stream _ice_is)";
+ << "read(Ice.Stream ice_is)";
out << sb;
if (sz <= 0x7f)
{
- out << nl << "long _ice_v = _ice_is.readByte();";
+ out << nl << "long ice_v = ice_is.readByte();";
}
else if (sz <= 0x7fff)
{
- out << nl << "long _ice_v = _ice_is.readShort();";
+ out << nl << "long ice_v = ice_is.readShort();";
}
else if (sz <= 0x7fffffff)
{
- out << nl << "long _ice_v = _ice_is.readInt();";
+ out << nl << "long ice_v = ice_is.readInt();";
}
else
{
- out << nl << "long _ice_v = _ice_is.readLong();";
+ out << nl << "long ice_v = ice_is.readLong();";
}
- out << nl << "return " << name << ".convert(_ice_v);";
+ out << nl << "return " << name << ".convert(ice_v);";
out << eb;
out << eb;
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 20:27:38 +0000