summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectionI.h
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-12-17 18:06:54 +0100
committerBenoit Foucher <benoit@zeroc.com>2014-12-17 18:06:54 +0100
commit5a57686d2ccbb085b8ac67908ad9525a6bafaf4b (patch)
tree58c2219412e8af66fbfd66d5269af6b7a48b28d2 /cpp/src/Ice/ConnectionI.h
parentAvoid check_output isn't supported with python 2.6 (diff)
downloadice-5a57686d2ccbb085b8ac67908ad9525a6bafaf4b.tar.bz2
ice-5a57686d2ccbb085b8ac67908ad9525a6bafaf4b.tar.xz
ice-5a57686d2ccbb085b8ac67908ad9525a6bafaf4b.zip
Fixed ICE-6199 - changed collocation optimization to call AMI cb asynchronously if AMD dispatch
Diffstat (limited to 'cpp/src/Ice/ConnectionI.h')
-rw-r--r--cpp/src/Ice/ConnectionI.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h
index 003ef41c519..4096ce5a2b4 100644
--- a/cpp/src/Ice/ConnectionI.h
+++ b/cpp/src/Ice/ConnectionI.h
@@ -192,9 +192,10 @@ public:
virtual void requestCanceled(IceInternal::OutgoingBase*, const LocalException&);
virtual void asyncRequestCanceled(const IceInternal::OutgoingAsyncBasePtr&, const LocalException&);
- virtual void sendResponse(Int, IceInternal::BasicStream*, Byte);
+ virtual void sendResponse(Int, IceInternal::BasicStream*, Byte, bool);
virtual void sendNoResponse();
- virtual bool systemException(Int, const SystemException&);
+ virtual bool systemException(Int, const SystemException&, bool);
+ virtual void invokeException(Ice::Int, const LocalException&, int, bool);
IceInternal::EndpointIPtr endpoint() const;
IceInternal::ConnectorPtr connector() const;
@@ -224,7 +225,6 @@ public:
virtual ConnectionInfoPtr getInfo() const; // From Connection
void exception(const LocalException&);
- virtual void invokeException(Ice::Int, const LocalException&, int);
void dispatch(const StartCallbackPtr&, const std::vector<OutgoingMessage>&, Byte, Int, Int,
const IceInternal::ServantManagerPtr&, const ObjectAdapterPtr&, const IceInternal::OutgoingAsyncPtr&,