summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Object.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2012-08-11 15:15:53 -0400
committerBernard Normier <bernard@zeroc.com>2012-08-11 15:15:53 -0400
commitbaf36f2a83903362608aa244d8f1c3c4d0e35773 (patch)
tree603b13da3589b8167bd460d9ea464a54a73b1a0d /cpp/src/Ice/Object.cpp
parentimplementing preserved slices in C# (diff)
downloadice-baf36f2a83903362608aa244d8f1c3c4d0e35773.tar.bz2
ice-baf36f2a83903362608aa244d8f1c3c4d0e35773.tar.xz
ice-baf36f2a83903362608aa244d8f1c3c4d0e35773.zip
Fixed bug #ICE-4845 (ice_clone for IceUtil::Exception is now covariant)
Small build fixes (VS warning, Python 3.x run.py) slice2cpp no longer generates ice_clone for interfaces
Diffstat (limited to 'cpp/src/Ice/Object.cpp')
-rw-r--r--cpp/src/Ice/Object.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index a8686c343bf..096bf434b5f 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -86,7 +86,7 @@ Ice::Object::ice_staticId()
return __Ice__Object_ids[0];
}
-ObjectPtr
+Ice::ObjectPtr
Ice::Object::ice_clone() const
{
throw CloneNotImplementedException(__FILE__, __LINE__);