summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2003-04-03 23:10:37 +0000
committerBenoit Foucher <benoit@zeroc.com>2003-04-03 23:10:37 +0000
commitc58f915120a9ff24ca58097e270f9fc83ef11cde (patch)
tree4ae430c925b49ed450214f64f36db49f77047d47 /cpp
parentbug fix for NullPointerException in readObject (diff)
downloadice-c58f915120a9ff24ca58097e270f9fc83ef11cde.tar.bz2
ice-c58f915120a9ff24ca58097e270f9fc83ef11cde.tar.xz
ice-c58f915120a9ff24ca58097e270f9fc83ef11cde.zip
Added virtual inheritance from IceUtil::Shared
Diffstat (limited to 'cpp')
-rw-r--r--cpp/include/Ice/OutgoingAsync.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h
index 85acbc23c03..0c809e14f13 100644
--- a/cpp/include/Ice/OutgoingAsync.h
+++ b/cpp/include/Ice/OutgoingAsync.h
@@ -1,3 +1,4 @@
+
// **********************************************************************
//
// Copyright (c) 2003
@@ -27,7 +28,11 @@ namespace IceInternal
class BasicStream;
-class ICE_API OutgoingAsync : public ::IceUtil::Shared
+//
+// We need virtual inheritance from shared, because the user might use
+// multiple inheritance from IceUtil::Shared.
+//
+class ICE_API OutgoingAsync : virtual public ::IceUtil::Shared
{
public: