summaryrefslogtreecommitdiff
path: root/cpp/src/IceXML
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/IceXML
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/IceXML')
-rw-r--r--cpp/src/IceXML/Parser.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/IceXML/Parser.cpp b/cpp/src/IceXML/Parser.cpp
index 9a32636b47e..cdcf553a8c5 100644
--- a/cpp/src/IceXML/Parser.cpp
+++ b/cpp/src/IceXML/Parser.cpp
@@ -28,16 +28,14 @@ IceXML::ParserException::ParserException(const char* file, int line, const strin
{
}
-IceXML::ParserException::~ParserException() throw()
+IceXML::ParserException::~ParserException() ICE_NOEXCEPT
{
}
-const char* IceXML::ParserException::_name = "IceXML::ParserException";
-
string
-IceXML::ParserException::ice_name() const
+IceXML::ParserException::ice_id() const
{
- return _name;
+ return "::IceXML::ParserException";
}
void
@@ -54,11 +52,13 @@ IceXML::ParserException::ice_print(std::ostream& out) const
}
}
+#ifndef ICE_CPP11_MAPPING
IceXML::ParserException*
IceXML::ParserException::ice_clone() const
{
return new ParserException(*this);
}
+#endif
void
IceXML::ParserException::ice_throw() const