summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/OutgoingAsync.cpp34
-rwxr-xr-xcpp/src/slice2cpp/Gen.cpp6
-rwxr-xr-xcpp/src/slice2cs/Gen.cpp6
-rw-r--r--cpp/src/slice2java/Gen.cpp8
4 files changed, 27 insertions, 27 deletions
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index 11c6bfb2a84..a40dc159a01 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -92,11 +92,11 @@ IceInternal::OutgoingAsyncMessageCallback::__exception(const Ice::Exception& exc
__warning();
}
- __release();
+ __releaseCallback();
}
void
-IceInternal::OutgoingAsyncMessageCallback::__acquire(const Ice::ObjectPrx& proxy)
+IceInternal::OutgoingAsyncMessageCallback::__acquireCallback(const Ice::ObjectPrx& proxy)
{
IceUtil::Monitor<IceUtil::Mutex>::Lock sync(__monitor);
@@ -116,7 +116,7 @@ IceInternal::OutgoingAsyncMessageCallback::__acquire(const Ice::ObjectPrx& proxy
}
void
-IceInternal::OutgoingAsyncMessageCallback::__release(const Ice::LocalException& exc)
+IceInternal::OutgoingAsyncMessageCallback::__releaseCallback(const Ice::LocalException& exc)
{
assert(__os);
@@ -133,13 +133,13 @@ IceInternal::OutgoingAsyncMessageCallback::__release(const Ice::LocalException&
}
catch(const Ice::CommunicatorDestroyedException&)
{
- __release();
+ __releaseCallback();
throw; // CommunicatorDestroyedException is the only exception that can propagate directly.
}
}
void
-IceInternal::OutgoingAsyncMessageCallback::__releaseNoSync()
+IceInternal::OutgoingAsyncMessageCallback::__releaseCallbackNoSync()
{
assert(__is);
delete __is;
@@ -196,7 +196,7 @@ IceInternal::OutgoingAsync::__sent(Ice::ConnectionI* connection)
if(!_proxy->ice_isTwoway())
{
- __releaseNoSync(); // No response expected, we're done with the OutgoingAsync.
+ __releaseCallbackNoSync(); // No response expected, we're done with the OutgoingAsync.
}
else if(_response)
{
@@ -363,12 +363,12 @@ IceInternal::OutgoingAsync::__finished(BasicStream& is)
catch(const std::exception& ex)
{
__warning(ex);
- __release();
+ __releaseCallback();
}
catch(...)
{
__warning();
- __release();
+ __releaseCallback();
}
}
@@ -613,7 +613,7 @@ IceInternal::OutgoingAsync::runTimerTask() // Implementation of TimerTask::runTi
void
IceInternal::BatchOutgoingAsync::__sent(Ice::ConnectionI* connection)
{
- __release();
+ __releaseCallback();
}
void
@@ -626,7 +626,7 @@ void
Ice::AMI_Object_ice_invoke::__invoke(const ObjectPrx& prx, const string& operation, OperationMode mode,
const vector<Byte>& inParams, const Context* context)
{
- __acquire(prx);
+ __acquireCallback(prx);
try
{
__prepare(prx, operation, mode, context);
@@ -636,7 +636,7 @@ Ice::AMI_Object_ice_invoke::__invoke(const ObjectPrx& prx, const string& operati
}
catch(const Ice::LocalException& ex)
{
- __release(ex);
+ __releaseCallback(ex);
}
}
@@ -657,14 +657,14 @@ Ice::AMI_Object_ice_invoke::__response(bool ok) // ok == true means no user exce
return;
}
ice_response(ok, outParams);
- __release();
+ __releaseCallback();
}
void
Ice::AMI_Array_Object_ice_invoke::__invoke(const ObjectPrx& prx, const string& operation, OperationMode mode,
const pair<const Byte*, const Byte*>& inParams, const Context* context)
{
- __acquire(prx);
+ __acquireCallback(prx);
try
{
__prepare(prx, operation, mode, context);
@@ -674,7 +674,7 @@ Ice::AMI_Array_Object_ice_invoke::__invoke(const ObjectPrx& prx, const string& o
}
catch(const Ice::LocalException& ex)
{
- __release(ex);
+ __releaseCallback(ex);
}
}
@@ -696,13 +696,13 @@ Ice::AMI_Array_Object_ice_invoke::__response(bool ok) // ok == true means no use
return;
}
ice_response(ok, outParams);
- __release();
+ __releaseCallback();
}
void
Ice::AMI_Object_ice_flushBatchRequests::__invoke(const ObjectPrx& prx)
{
- __acquire(prx);
+ __acquireCallback(prx);
try
{
//
@@ -723,7 +723,7 @@ Ice::AMI_Object_ice_flushBatchRequests::__invoke(const ObjectPrx& prx)
}
catch(const Ice::LocalException& ex)
{
- __release(ex);
+ __releaseCallback(ex);
}
}
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 99246a22d77..5dddfc3f6dd 100755
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -5293,7 +5293,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
C << sp << nl << "void" << nl << classScopedAMI.substr(2) << '_' << name << "::__invoke" << spar
<< paramsDeclInvoke << epar;
C << sb;
- C << nl << "__acquire(__prx);";
+ C << nl << "__acquireCallback(__prx);";
C << nl << "try";
C << sb;
if(p->returnsData())
@@ -5311,7 +5311,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
C << eb;
C << nl << "catch(const ::Ice::LocalException& __ex)";
C << sb;
- C << nl << "__release(__ex);";
+ C << nl << "__releaseCallback(__ex);";
C << eb;
C << eb;
@@ -5378,7 +5378,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
C << nl << "return;";
C << eb;
C << nl << "ice_response" << spar << args << epar << ';';
- C << nl << "__release();";
+ C << nl << "__releaseCallback();";
C << eb;
}
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index e4971e68b24..4f5b760aa71 100755
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -4565,7 +4565,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
_out << sp << nl << "public void invoke__" << spar << "Ice.ObjectPrx prx__"
<< paramsInvoke << "_System.Collections.Generic.Dictionary<string, string> ctx__" << epar;
_out << sb;
- _out << nl << "acquire__(prx__);";
+ _out << nl << "acquireCallback__(prx__);";
_out << nl << "try";
_out << sb;
if(p->returnsData())
@@ -4587,7 +4587,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
_out << eb;
_out << nl << "catch(Ice.LocalException ex__)";
_out << sb;
- _out << nl << "release__(ex__);";
+ _out << nl << "releaseCallback__(ex__);";
_out << eb;
_out << eb;
@@ -4696,7 +4696,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
_out << nl << "return;";
_out << eb;
_out << nl << "ice_response" << spar << args << epar << ';';
- _out << nl << "release__();";
+ _out << nl << "releaseCallback__();";
_out << eb;
_out << eb;
}
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 2a01023162a..bef793f2672 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -5070,7 +5070,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
out << sp << nl << "public final void" << nl << "__invoke" << spar << "Ice.ObjectPrx __prx"
<< paramsInvoke << contextParam << epar;
out << sb;
- out << nl << "__acquire(__prx);";
+ out << nl << "__acquireCallback(__prx);";
out << nl << "try";
out << sb;
if(p->returnsData())
@@ -5095,7 +5095,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
out << eb;
out << nl << "catch(Ice.LocalException __ex)";
out << sb;
- out << nl << "__release(__ex);";
+ out << nl << "__releaseCallback(__ex);";
out << eb;
out << eb;
@@ -5205,7 +5205,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
out << eb;
out << nl << "finally";
out << sb;
- out << nl << "__release();";
+ out << nl << "__releaseCallback();";
out << eb;
out << nl << "return;";
out << eb;
@@ -5216,7 +5216,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
out << nl << "return;";
out << eb;
out << nl << "ice_response" << spar << args << epar << ';';
- out << nl << "__release();";
+ out << nl << "__releaseCallback();";
out << eb;
out << eb;
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 12:32:41 +0000