ice_name/ice_id fixes & simplifications.

5 files changed, 16 insertions, 20 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
diff --git a/cpp/test/Ice/interceptor/MyObjectI.h b/cpp/test/Ice/interceptor/MyObjectI.h
index 9ba0c9f3e37..b7a61435a81 100644
--- a/cpp/test/Ice/interceptor/MyObjectI.h
+++ b/cpp/test/Ice/interceptor/MyObjectI.h
@@ -18,11 +18,12 @@ public:
   
     MySystemException(const char*, int);
 
-    virtual ~MySystemException() throw();
+    virtual ~MySystemException() ICE_NOEXCEPT;
 
-    virtual std::string ice_name() const;
     virtual std::string ice_id() const;
+#ifndef ICE_CPP11_MAPPING
     virtual MySystemException* ice_clone() const;
+#endif
     virtual void ice_throw() const;
 };
 
diff --git a/cpp/test/Ice/plugin/Plugin.cpp b/cpp/test/Ice/plugin/Plugin.cpp
index 8e4c23d8ffd..0e5e60b2e21 100644
--- a/cpp/test/Ice/plugin/Plugin.cpp
+++ b/cpp/test/Ice/plugin/Plugin.cpp
@@ -58,9 +58,9 @@ class PluginInitializeFailExeption : public std::exception
 
 public:
 
-    PluginInitializeFailExeption() throw() {}
-    virtual ~PluginInitializeFailExeption() throw() {}
-    virtual const char* what() const throw() { return "PluginInitializeFailExeption"; }
+    PluginInitializeFailExeption() ICE_NOEXCEPT {}
+    virtual ~PluginInitializeFailExeption() ICE_NOEXCEPT {}
+    virtual const char* what() const ICE_NOEXCEPT { return "PluginInitializeFailExeption"; }
 };
 
 class PluginInitializeFail : public Ice::Plugin
diff --git a/cpp/test/Ice/retry/SystemFailure.h b/cpp/test/Ice/retry/SystemFailure.h
index a58c3d7b1b4..4ef97f37ffa 100644
--- a/cpp/test/Ice/retry/SystemFailure.h
+++ b/cpp/test/Ice/retry/SystemFailure.h
@@ -23,21 +23,18 @@ public:
     SystemFailure(const SystemFailure& ex) : Ice::SystemException(ex.ice_file(), ex.ice_line())
     {
     }
-
-    virtual std::string ice_name() const
-    {
-        return ice_id();
-    }
     
     virtual std::string ice_id() const
     {
         return "SystemFailure";
     }
 
+#ifndef ICE_CPP11_MAPPING
     virtual SystemException* ice_clone() const
     {
         return new SystemFailure(*this);
     }
+#endif
 
     virtual void ice_throw() const
     {
diff --git a/cpp/test/include/TestCommon.h b/cpp/test/include/TestCommon.h
index 322672478ac..cad96b6bc41 100644
--- a/cpp/test/include/TestCommon.h
+++ b/cpp/test/include/TestCommon.h
@@ -144,19 +144,21 @@ public:
     {
     }
 
-    virtual ~TestFailedException() throw()
+    virtual ~TestFailedException() ICE_NOEXCEPT
     {
     }
 
-    virtual ::std::string ice_name() const
+    virtual ::std::string ice_id() const
     {
         return "::TestFailedException";
     }
 
+#ifndef ICE_CPP11_MAPPING
     virtual TestFailedException* ice_clone() const
     {
         return new TestFailedException(*this);
     }
+#endif
 
     virtual void ice_throw() const
     {