summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2006-11-20 14:42:16 +0000
committerDwayne Boone <dwayne@zeroc.com>2006-11-20 14:42:16 +0000
commita743c706868a95d9876cc79f9869e2870cd90802 (patch)
tree5162e376e21383ac75564fd7ad9307743884ee76
parentAdded cancel operation (diff)
downloadice-a743c706868a95d9876cc79f9869e2870cd90802.tar.bz2
ice-a743c706868a95d9876cc79f9869e2870cd90802.tar.xz
ice-a743c706868a95d9876cc79f9869e2870cd90802.zip
Minor changes
-rw-r--r--cpp/demo/Ice/async/QueueI.cpp10
-rw-r--r--cpp/demo/Ice/async/QueueI.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/cpp/demo/Ice/async/QueueI.cpp b/cpp/demo/Ice/async/QueueI.cpp
index c071a6b1267..6afb83fd9c5 100644
--- a/cpp/demo/Ice/async/QueueI.cpp
+++ b/cpp/demo/Ice/async/QueueI.cpp
@@ -12,7 +12,7 @@
using namespace std;
void
-QueueI::get_async(const Demo::AMD_Queue_getPtr& getCB, const string& id, const Ice::Current&)
+QueueI::get_async(const Demo::AMD_Queue_getPtr& cb, const string& id, const Ice::Current&)
{
IceUtil::Mutex::Lock lock(*this);
@@ -25,7 +25,7 @@ QueueI::get_async(const Demo::AMD_Queue_getPtr& getCB, const string& id, const I
{
try
{
- getCB->ice_response(_messageQueue.front());
+ cb->ice_response(_messageQueue.front());
_messageQueue.pop_front();
}
catch(const Ice::Exception& ex)
@@ -37,7 +37,7 @@ QueueI::get_async(const Demo::AMD_Queue_getPtr& getCB, const string& id, const I
{
Request request;
request.id = id;
- request.request = getCB;
+ request.cb = cb;
_requestQueue.push_back(request);
}
}
@@ -56,7 +56,7 @@ QueueI::add(const string& message, const Ice::Current&)
{
try
{
- _requestQueue.front().request->ice_response(message);
+ _requestQueue.front().cb->ice_response(message);
}
catch(const Ice::Exception& ex)
{
@@ -90,7 +90,7 @@ QueueI::cancel_async(const Demo::AMD_Queue_cancelPtr& cb, const vector<string>&
{
try
{
- (*q).request->ice_exception(Demo::RequestCanceledException());
+ (*q).cb->ice_exception(Demo::RequestCanceledException());
}
catch(const Ice::Exception&)
{
diff --git a/cpp/demo/Ice/async/QueueI.h b/cpp/demo/Ice/async/QueueI.h
index 6fae5bc1865..52043328a98 100644
--- a/cpp/demo/Ice/async/QueueI.h
+++ b/cpp/demo/Ice/async/QueueI.h
@@ -27,7 +27,7 @@ private:
struct Request
{
std::string id;
- Demo::AMD_Queue_getPtr request;
+ Demo::AMD_Queue_getPtr cb;
};
std::list<std::string> _messageQueue;