1 files changed, 24 insertions, 24 deletions

diff --git a/cpp/src/IceUtil/ThreadException.cpp b/cpp/src/IceUtil/ThreadException.cpp
index 8b354517d99..c41106820ce 100644
--- a/cpp/src/IceUtil/ThreadException.cpp
+++ b/cpp/src/IceUtil/ThreadException.cpp
@@ -15,20 +15,20 @@ IceUtil::ThreadSyscallException::ThreadSyscallException(const char* file, int li
     SyscallException(file, line, err)
 {
 }
-    
-const char* IceUtil::ThreadSyscallException::_name = "IceUtil::ThreadSyscallException";
 
 string
-IceUtil::ThreadSyscallException::ice_name() const
+IceUtil::ThreadSyscallException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::ThreadSyscallException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::ThreadSyscallException*
 IceUtil::ThreadSyscallException::ice_clone() const
 {
     return new ThreadSyscallException(*this);
 }
+#endif
 
 void
 IceUtil::ThreadSyscallException::ice_throw() const
@@ -41,19 +41,19 @@ IceUtil::ThreadLockedException::ThreadLockedException(const char* file, int line
 {
 }
 
-const char* IceUtil::ThreadLockedException::_name = "IceUtil::ThreadLockedException";
-
 string
-IceUtil::ThreadLockedException::ice_name() const
+IceUtil::ThreadLockedException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::ThreadLockedException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::ThreadLockedException*
 IceUtil::ThreadLockedException::ice_clone() const
 {
     return new ThreadLockedException(*this);
 }
+#endif
 
 void
 IceUtil::ThreadLockedException::ice_throw() const
@@ -66,19 +66,19 @@ IceUtil::ThreadStartedException::ThreadStartedException(const char* file, int li
 {
 }
 
-const char* IceUtil::ThreadStartedException::_name = "IceUtil::ThreadStartedException";
-
 string
-IceUtil::ThreadStartedException::ice_name() const
+IceUtil::ThreadStartedException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::ThreadStartedException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::ThreadStartedException*
 IceUtil::ThreadStartedException::ice_clone() const
 {
     return new ThreadStartedException(*this);
 }
+#endif
 
 void
 IceUtil::ThreadStartedException::ice_throw() const
@@ -91,19 +91,19 @@ IceUtil::ThreadNotStartedException::ThreadNotStartedException(const char* file,
 {
 }
 
-const char* IceUtil::ThreadNotStartedException::_name = "IceUtil::ThreadNotStartedException";
-
 string
-IceUtil::ThreadNotStartedException::ice_name() const
+IceUtil::ThreadNotStartedException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::ThreadNotStartedException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::ThreadNotStartedException*
 IceUtil::ThreadNotStartedException::ice_clone() const
 {
     return new ThreadNotStartedException(*this);
 }
+#endif
 
 void
 IceUtil::ThreadNotStartedException::ice_throw() const
@@ -117,19 +117,19 @@ IceUtil::BadThreadControlException::BadThreadControlException(const char* file,
 {
 }
 
-const char* IceUtil::BadThreadControlException::_name = "IceUtil::BadThreadControlException";
-
 string
-IceUtil::BadThreadControlException::ice_name() const
+IceUtil::BadThreadControlException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::BadThreadControlException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::BadThreadControlException*
 IceUtil::BadThreadControlException::ice_clone() const
 {
     return new BadThreadControlException(*this);
 }
+#endif
 
 void
 IceUtil::BadThreadControlException::ice_throw() const
@@ -143,13 +143,11 @@ IceUtil::InvalidTimeoutException::InvalidTimeoutException(const char* file, int
     _timeout(timeout)
 {
 }
-    
-const char* IceUtil::InvalidTimeoutException::_name = "IceUtil::InvalidTimeoutException";
 
 string
-IceUtil::InvalidTimeoutException::ice_name() const
+IceUtil::InvalidTimeoutException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::InvalidTimeoutException";
 }
 
 void
@@ -159,11 +157,13 @@ IceUtil::InvalidTimeoutException::ice_print(ostream& os) const
     os << ":\ninvalid timeout: " << _timeout << " seconds";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::InvalidTimeoutException*
 IceUtil::InvalidTimeoutException::ice_clone() const
 {
     return new InvalidTimeoutException(*this);
 }
+#endif
 
 void
 IceUtil::InvalidTimeoutException::ice_throw() const