summaryrefslogtreecommitdiff
path: root/cpp/src/IceXML
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2016-06-09 14:50:25 -0400
committerJoe George <joe@zeroc.com>2016-06-10 16:18:16 -0400
commit099dc25550da1e1612a6508c3e18954dbc01e6cd (patch)
tree348c81e88e50a4a84eee94672022c89ac935c5a2 /cpp/src/IceXML
parentRestored serveramd on Linux/OSX (diff)
downloadice-099dc25550da1e1612a6508c3e18954dbc01e6cd.tar.bz2
ice-099dc25550da1e1612a6508c3e18954dbc01e6cd.tar.xz
ice-099dc25550da1e1612a6508c3e18954dbc01e6cd.zip
ICE-7176 - Cleanup exception dtor noexcept
Diffstat (limited to 'cpp/src/IceXML')
-rw-r--r--cpp/src/IceXML/Parser.cpp6
-rw-r--r--cpp/src/IceXML/Parser.h4
2 files changed, 7 insertions, 3 deletions
diff --git a/cpp/src/IceXML/Parser.cpp b/cpp/src/IceXML/Parser.cpp
index 60eb73e3c58..5cae7178956 100644
--- a/cpp/src/IceXML/Parser.cpp
+++ b/cpp/src/IceXML/Parser.cpp
@@ -28,9 +28,11 @@ IceXML::ParserException::ParserException(const char* file, int line, const strin
{
}
-IceXML::ParserException::~ParserException() ICE_NOEXCEPT
+#ifndef ICE_CPP11_COMPILER
+IceXML::ParserException::~ParserException() throw()
{
}
+#endif
string
IceXML::ParserException::ice_id() const
@@ -433,7 +435,7 @@ IceXML::Parser::parse(istream& in, Handler& handler)
}
if(XML_Parse(parser, buff, static_cast<int>(in.gcount()), isFinal) != 1)
{
- handler.error(XML_ErrorString(XML_GetErrorCode(parser)),
+ handler.error(XML_ErrorString(XML_GetErrorCode(parser)),
static_cast<int>(XML_GetCurrentLineNumber(parser)),
static_cast<int>(XML_GetCurrentColumnNumber(parser)));
return;
diff --git a/cpp/src/IceXML/Parser.h b/cpp/src/IceXML/Parser.h
index 366ca674d89..b44b3cac897 100644
--- a/cpp/src/IceXML/Parser.h
+++ b/cpp/src/IceXML/Parser.h
@@ -48,7 +48,9 @@ public:
ParserException(const std::string&);
ParserException(const char*, int, const std::string&);
- virtual ~ParserException() ICE_NOEXCEPT;
+#ifndef ICE_CPP11_COMPILER
+ virtual ~ParserException() throw();
+#endif
virtual std::string ice_id() const;
virtual void ice_print(std::ostream&) const;