summaryrefslogtreecommitdiff
path: root/cpp/src/Slice/FileTracker.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-01-20 10:36:51 +0100
committerJose <jose@zeroc.com>2016-01-20 10:36:51 +0100
commit13f4fd6d3cc5a044db66d9c25319419bb4ede5fa (patch)
treec230ae28caba40ac1f939fbedb5fd780d49fad0c /cpp/src/Slice/FileTracker.cpp
parentICE-6861 - removing public stream API (diff)
downloadice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.tar.bz2
ice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.tar.xz
ice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.zip
ice_name/ice_id fixes & simplifications.
Diffstat (limited to 'cpp/src/Slice/FileTracker.cpp')
-rw-r--r--cpp/src/Slice/FileTracker.cpp10
1 files changed, 5 insertions, 5 deletions
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