summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/interceptor/MyObjectI.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-01-20 10:36:51 +0100
committerJose <jose@zeroc.com>2016-01-20 10:36:51 +0100
commit13f4fd6d3cc5a044db66d9c25319419bb4ede5fa (patch)
treec230ae28caba40ac1f939fbedb5fd780d49fad0c /cpp/test/Ice/interceptor/MyObjectI.cpp
parentICE-6861 - removing public stream API (diff)
downloadice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.tar.bz2
ice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.tar.xz
ice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.zip
ice_name/ice_id fixes & simplifications.
Diffstat (limited to 'cpp/test/Ice/interceptor/MyObjectI.cpp')
-rw-r--r--cpp/test/Ice/interceptor/MyObjectI.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/cpp/test/Ice/interceptor/MyObjectI.cpp b/cpp/test/Ice/interceptor/MyObjectI.cpp
index 0ebb06cdd17..72c64aba5fb 100644
--- a/cpp/test/Ice/interceptor/MyObjectI.cpp
+++ b/cpp/test/Ice/interceptor/MyObjectI.cpp
@@ -20,27 +20,23 @@ MySystemException::MySystemException(const char* file, int line) :
{
}
-MySystemException::~MySystemException() throw()
+MySystemException::~MySystemException() ICE_NOEXCEPT
{
}
string
MySystemException::ice_id() const
{
- return "MySystemException";
-}
-
-string
-MySystemException::ice_name() const
-{
- return ice_id();
+ return "::MySystemException";
}
+#ifndef ICE_CPP11_MAPPING
MySystemException*
MySystemException::ice_clone() const
{
return new MySystemException(*this);
}
+#endif
void
MySystemException::ice_throw() const