From c60a1921e656ed70cd03db969749110da42c1e5c Mon Sep 17 00:00:00 2001 From: ZeroC Staff Date: Mon, 8 Oct 2001 18:49:03 +0000 Subject: Ice::Object now inherits virtually from IceUtil::Shared in order to allow multiple inheritance to work properly. --- cpp/include/Ice/Object.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cpp/include/Ice/Object.h') diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h index 603ccdbc402..4b702e837ed 100644 --- a/cpp/include/Ice/Object.h +++ b/cpp/include/Ice/Object.h @@ -67,7 +67,7 @@ protected: ObjectPtr _ptr; }; -class ICE_API Object : public ::IceUtil::Shared +class ICE_API Object : virtual public ::IceUtil::Shared { public: -- cgit v1.2.3