summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Object.cpp
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2005-06-20 12:48:38 +0000
committerMichi Henning <michi@zeroc.com>2005-06-20 12:48:38 +0000
commitec7622852746c5f8f73b26ecf4c42fb5baeffca1 (patch)
tree88704bf921222d742e6327073b69e06828d8bc97 /cpp/src/Ice/Object.cpp
parentAnother fix for bug 377 -- the string wrapper was incorrect as well. (diff)
downloadice-ec7622852746c5f8f73b26ecf4c42fb5baeffca1.tar.bz2
ice-ec7622852746c5f8f73b26ecf4c42fb5baeffca1.tar.xz
ice-ec7622852746c5f8f73b26ecf4c42fb5baeffca1.zip
Removed copy constructor and assignment operator for exceptions and
classes. Removed #undef scheme and add UndefSysMacros.h instead.
Diffstat (limited to 'cpp/src/Ice/Object.cpp')
-rw-r--r--cpp/src/Ice/Object.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index a4c419f5dc6..aa8f9750764 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -20,9 +20,11 @@ using namespace IceInternal;
void IceInternal::incRef(Object* p) { p->__incRef(); }
void IceInternal::decRef(Object* p) { p->__decRef(); }
+#if 0
Ice::Object::Object()
{
}
+#endif
bool
Ice::Object::operator==(const Object& r) const
@@ -83,20 +85,10 @@ Ice::Object::ice_staticId()
return __Ice__Object_ids[0];
}
-void
-Ice::Object::__copyMembers(ObjectPtr to) const
-{
-}
-
ObjectPtr
Ice::Object::ice_clone() const
{
ObjectPtr __p = new Ice::Object;
-#ifdef _WIN32
- Object::__copyMembers(__p);
-#else
- ::Ice::Object::__copyMembers(__p);
-#endif
return __p;
}