diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-06-11 18:53:17 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-06-11 18:53:17 +0200 |
| commit | 27b1f7cc1b061fbf3a1582963d0af08d5839d480 (patch) | |
| tree | c93c4a0c885ec941ec33116dd2f5683042d96a34 /cpp/src/Ice/Object.cpp | |
| parent | Java port (diff) | |
| download | ice-27b1f7cc1b061fbf3a1582963d0af08d5839d480.tar.bz2 ice-27b1f7cc1b061fbf3a1582963d0af08d5839d480.tar.xz ice-27b1f7cc1b061fbf3a1582963d0af08d5839d480.zip | |
Support for optionals
Diffstat (limited to 'cpp/src/Ice/Object.cpp')
| -rw-r--r-- | cpp/src/Ice/Object.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index 8cce4a577a0..875c58ed78d 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -20,7 +20,13 @@ using namespace std; using namespace Ice; using namespace IceInternal; -IceUtil::Shared* Ice::upCast(Object* p) { return p; } +Object* Ice::upCast(Object* p) { return p; } + +void +Ice::__patch(ObjectPtr& obj, ObjectPtr& v) +{ + obj = v; +} bool Ice::Object::operator==(const Object& r) const @@ -242,13 +248,6 @@ Ice::Object::__collocDispatch(IceInternal::Direct& request) return request.run(this); } -void -Ice::__patch__ObjectPtr(void* __addr, ObjectPtr& v) -{ - ObjectPtr* p = static_cast<ObjectPtr*>(__addr); - *p = v; -} - namespace { |