1 files changed, 46 insertions, 17 deletions
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index 0dd364ca01b..b24d64a6b53 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -102,6 +102,22 @@ throwMarshalException(const char* file, int line, const string& reason)
 }
 }
 
+namespace
+{
+
+const string __Ice__UserException_ids[] =
+{
+    "::Ice::UserException"
+};
+
+}
+
+const std::string&
+Ice::UserException::ice_staticId()
+{
+    return __Ice__UserException_ids[0];
+};
+
 void
 Ice::UserException::__write(::Ice::OutputStream* os) const
 {
@@ -129,41 +145,54 @@ Ice::LocalException::LocalException(const char* file, int line) :
 {
 }
 
-Ice::LocalException::~LocalException() ICE_NOEXCEPT
+#ifndef ICE_CPP11_COMPILER
+Ice::LocalException::~LocalException() throw()
 {
 }
+#endif
+
+namespace
+{
+
+const string __Ice__LocalException_ids[] =
+{
+    "::Ice::LocalException"
+};
+
+}
+
+const std::string&
+Ice::LocalException::ice_staticId()
+{
+    return __Ice__LocalException_ids[0];
+}
 
 Ice::SystemException::SystemException(const char* file, int line) :
     Exception(file, line)
 {
 }
 
-Ice::SystemException::~SystemException() ICE_NOEXCEPT
+#ifndef ICE_CPP11_COMPILER
+Ice::SystemException::~SystemException() throw()
 {
 }
+#endif
 
-#if defined(__SUNPRO_CC)
-ostream&
-Ice::operator<<(ostream& out, const Ice::UserException& ex)
+namespace
 {
-    ex.ice_print(out);
-    return out;
-}
 
-ostream&
-Ice::operator<<(ostream& out, const Ice::LocalException& ex)
+const string __Ice__SystemException_ids[] =
 {
-    ex.ice_print(out);
-    return out;
+    "::Ice::SystemException"
+};
+
 }
 
-ostream&
-Ice::operator<<(ostream& out, const Ice::SystemException& ex)
+const std::string&
+Ice::SystemException::ice_staticId()
 {
-    ex.ice_print(out);
-    return out;
+    return __Ice__SystemException_ids[0];
 }
-#endif
 
 void
 Ice::InitializationException::ice_print(ostream& out) const