diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2011-10-18 22:18:35 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2011-10-18 22:50:09 +0200 |
| commit | 54a5e8d05528c379b1c3465b908c18fe5aa5d2b3 (patch) | |
| tree | da218465a52a7eaf19c44d281fc3952e40f9f59b /cpp/src/Ice/Object.cpp | |
| parent | Fixed ICE-4722 - Bogus communicator initialization in Freeze map (diff) | |
| download | ice-54a5e8d05528c379b1c3465b908c18fe5aa5d2b3.tar.bz2 ice-54a5e8d05528c379b1c3465b908c18fe5aa5d2b3.tar.xz ice-54a5e8d05528c379b1c3465b908c18fe5aa5d2b3.zip | |
Fixed ICE-4721 - support for OS X clang
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 fa7793ab7d1..9705ce98a86 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; -IceUtil::Shared* IceInternal::upCast(Object* p) { return p; } +IceUtil::Shared* Ice::upCast(Object* p) { return p; } bool Ice::Object::operator==(const Object& r) const |