diff options
| author | Michi Henning <michi@zeroc.com> | 2009-12-09 15:12:12 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2009-12-09 15:12:12 +1000 |
| commit | d0d27bb7cf7b5ff8f9f3028f63f650f1d0b01678 (patch) | |
| tree | 9524523d712bca42f6bd36fabd72c76371ecdca8 /cpp/include/Ice/ObjectF.h | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| parent | fix for cpp/test/Ice/Makefile.mak (diff) | |
| download | ice-d0d27bb7cf7b5ff8f9f3028f63f650f1d0b01678.tar.bz2 ice-d0d27bb7cf7b5ff8f9f3028f63f650f1d0b01678.tar.xz ice-d0d27bb7cf7b5ff8f9f3028f63f650f1d0b01678.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/include/Ice/ObjectF.h')
| -rw-r--r-- | cpp/include/Ice/ObjectF.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/include/Ice/ObjectF.h b/cpp/include/Ice/ObjectF.h index 1d83231b4a2..a3d461a10d2 100644 --- a/cpp/include/Ice/ObjectF.h +++ b/cpp/include/Ice/ObjectF.h @@ -10,9 +10,8 @@ #ifndef ICE_OBJECT_F_H #define ICE_OBJECT_F_H +#include <IceUtil/Shared.h> #include <Ice/Handle.h> -#include <Ice/GCCountMap.h> -#include <Ice/GCShared.h> namespace Ice { @@ -24,7 +23,7 @@ class Object; namespace IceInternal { -ICE_API GCShared* upCast(::Ice::Object*); +ICE_API IceUtil::Shared* upCast(::Ice::Object*); } |