From 665b6242fc338bb21ee8ac5131012cf6d230ed1e Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 31 Aug 2016 12:57:38 +0200
Subject: Work around symbol exporting issues, throw() deprecation

---
 xml/parser | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'xml/parser')

diff --git a/xml/parser b/xml/parser
index d891c3e..5a8fac9 100644
--- a/xml/parser
+++ b/xml/parser
@@ -13,7 +13,8 @@
 #include <iosfwd>
 #include <cstddef> // std::size_t
 
-#include <xml/details/config.hxx> // LIBSTUDXML_EXTERNAL_EXPAT
+#include <xml/details/config.hxx> // STUDXML_NOTHROW_NOEXCEPT,
+                                  // LIBSTUDXML_EXTERNAL_EXPAT
 
 #ifndef LIBSTUDXML_EXTERNAL_EXPAT
 #  include <xml/details/expat/expat.h>
@@ -36,18 +37,18 @@
 
 namespace xml
 {
-  class LIBSTUDXML_EXPORT parsing: public exception
+  class parsing: public exception
   {
   public:
     virtual
-    ~parsing () throw ();
+    ~parsing () STUDXML_NOTHROW_NOEXCEPT {}
 
     parsing (const std::string& name,
              unsigned long long line,
              unsigned long long column,
              const std::string& description);
 
-    parsing (const parser&, const std::string& description);
+    parsing (const parser& p, const std::string& description);
 
     const std::string&
     name () const {return name_;}
@@ -62,10 +63,10 @@ namespace xml
     description () const {return description_;}
 
     virtual const char*
-    what () const throw ();
+    what () const STUDXML_NOTHROW_NOEXCEPT {return what_.c_str ();}
 
   private:
-    void
+    LIBSTUDXML_EXPORT void
     init ();
 
   private:
-- 
cgit v1.1