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/src/Ice/Object.cpp | |
| 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/src/Ice/Object.cpp')
| -rw-r--r-- | cpp/src/Ice/Object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index 0d102ae1a63..0fd4c42c0a1 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -19,7 +19,7 @@ using namespace std; using namespace Ice; using namespace IceInternal; -IceInternal::GCShared* IceInternal::upCast(Object* p) { return p; } +IceUtil::Shared* IceInternal::upCast(Object* p) { return p; } bool Ice::Object::operator==(const Object& r) const |