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/src/Slice/FileTracker.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'cpp/src/Slice/FileTracker.cpp')

diff --git a/cpp/src/Slice/FileTracker.cpp b/cpp/src/Slice/FileTracker.cpp
index fcf5060af5b..9b9149970e4 100644
--- a/cpp/src/Slice/FileTracker.cpp
+++ b/cpp/src/Slice/FileTracker.cpp
@@ -23,16 +23,14 @@ Slice::FileException::FileException(const char* file, int line, const string& r)
 {
 }
 
-Slice::FileException::~FileException() throw()
+Slice::FileException::~FileException() ICE_NOEXCEPT
 {
 }
 
-const char* Slice::FileException::_name = "Slice::FileException";
-
 string
-Slice::FileException::ice_name() const
+Slice::FileException::ice_id() const
 {
-    return _name;
+    return "::Slice::FileException";
 }
 
 void
@@ -42,11 +40,13 @@ Slice::FileException::ice_print(ostream& out) const
     out << ": " << _reason;
 }
 
+#ifndef ICE_CPP11_MAPPING
 Slice::FileException*
 Slice::FileException::ice_clone() const
 {
     return new FileException(*this);
 }
+#endif
 
 void
 Slice::FileException::ice_throw() const
-- 
cgit v1.2.3