diff options
Diffstat (limited to 'cpp/include/Ice/Object.h')
| -rw-r--r-- | cpp/include/Ice/Object.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h index 1ee34b1e58a..603ccdbc402 100644 --- a/cpp/include/Ice/Object.h +++ b/cpp/include/Ice/Object.h @@ -13,7 +13,7 @@ #include <IceUtil/Shared.h> #include <Ice/ObjectF.h> -#include <Ice/Proxy.h> +#include <Ice/ProxyF.h> namespace IceInternal { @@ -67,7 +67,7 @@ protected: ObjectPtr _ptr; }; -class ICE_API Object : virtual public ::IceDelegate::Ice::Object +class ICE_API Object : public ::IceUtil::Shared { public: |