diff options
| author | Michi Henning <michi@zeroc.com> | 2005-04-08 07:20:55 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2005-04-08 07:20:55 +0000 |
| commit | 03ffb6150280bce832c6ba82fedefc9440b07f10 (patch) | |
| tree | e0a679d4599a9a3a773fa18b96ff5ea1e711fed4 /cpp | |
| parent | fixing compilation errors (diff) | |
| download | ice-03ffb6150280bce832c6ba82fedefc9440b07f10.tar.bz2 ice-03ffb6150280bce832c6ba82fedefc9440b07f10.tar.xz ice-03ffb6150280bce832c6ba82fedefc9440b07f10.zip | |
Now using non-virtual inheritance of Object from GCShared.
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 fe0db9946a5..0ca07d3861f 100644 --- a/cpp/include/Ice/Object.h +++ b/cpp/include/Ice/Object.h @@ -49,7 +49,7 @@ namespace Ice // a servant class from both Ice::Object and IceUtil::Thread. However, // we never derive from IceUtil::GCShared more than once. // -class ICE_API Object : virtual public IceUtil::GCShared +class ICE_API Object : public IceUtil::GCShared { public: |