diff options
| author | ZeroC Staff <git@zeroc.com> | 2001-10-08 18:49:03 +0000 |
|---|---|---|
| committer | ZeroC Staff <git@zeroc.com> | 2001-10-08 18:49:03 +0000 |
| commit | c60a1921e656ed70cd03db969749110da42c1e5c (patch) | |
| tree | 6f07eb0d7ebdf52a709fd7b5cddf8bf7e1b2612a /cpp | |
| parent | IceUtil::Exception (diff) | |
| download | ice-c60a1921e656ed70cd03db969749110da42c1e5c.tar.bz2 ice-c60a1921e656ed70cd03db969749110da42c1e5c.tar.xz ice-c60a1921e656ed70cd03db969749110da42c1e5c.zip | |
Ice::Object now inherits virtually from IceUtil::Shared in order to allow
multiple inheritance to work properly.
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/Ice/Object.h | 2 |
1 files changed, 1 insertions, 1 deletions
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: |