From 13f4fd6d3cc5a044db66d9c25319419bb4ede5fa Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Wed, 20 Jan 2016 10:36:51 +0100
Subject: ice_name/ice_id fixes & simplifications.

---
 cpp/test/Ice/interceptor/MyObjectI.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'cpp/test/Ice/interceptor/MyObjectI.cpp')

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
-- 
cgit v1.2.3