Add back void* casts for legacy builds.

[shibboleth/cpp-xmltooling.git] / xmltooling / exceptions.h

diff --git a/xmltooling/exceptions.h b/xmltooling/exceptions.h
index 14fbdab..67baa82 100644 (file)
--- a/xmltooling/exceptions.h
+++ b/xmltooling/exceptions.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2006 Internet2
+ *  Copyright 2001-2010 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,19 +15,20 @@
  */
 
 /**
- * @file exceptions.h
+ * @file xmltooling/exceptions.h
  * 
- * Exception classes
+ * Exception classes.
  */
  
 #ifndef __xmltooling_exceptions_h__
 #define __xmltooling_exceptions_h__
 
+#include <xmltooling/base.h>
+
 #include <map>
 #include <string>
 #include <vector>
 #include <iostream>
-#include <xmltooling/base.h>
 
 /**
  * Declares a derived exception class
@@ -43,14 +44,14 @@
     class linkage name : public base { \
     public: \
         XMLTOOLING_DOXYGEN(Constructor) \
-        name(const char* msg=NULL, const xmltooling::params& p=xmltooling::params()) : base(msg,p) {} \
+        name(const char* msg=nullptr, const xmltooling::params& p=xmltooling::params()) : base(msg,p) {} \
         XMLTOOLING_DOXYGEN(Constructor) \
         name(const char* msg, const xmltooling::namedparams& p) : base(msg,p) {} \
         XMLTOOLING_DOXYGEN(Constructor) \
         name(const std::string& msg, const xmltooling::params& p=xmltooling::params()) : base(msg,p) {} \
         XMLTOOLING_DOXYGEN(Constructor) \
         name(const std::string& msg, const xmltooling::namedparams& p) : base(msg,p) {} \
-        virtual ~name() {} \
+        virtual ~name() throw () {} \
         virtual const char* getClassName() const { return #ns"::"#name; } \
         void raise() const {throw *this;} \
     }
@@ -139,7 +140,7 @@ namespace xmltooling {
     class XMLTOOL_EXCEPTIONAPI(XMLTOOL_API) XMLToolingException : public std::exception
     {
     public:
-        virtual ~XMLToolingException() {}
+        virtual ~XMLToolingException() throw () {}
 
         /**
          * Constructs an exception using a message and positional parameters.
@@ -147,7 +148,7 @@ namespace xmltooling {
          * @param msg   error message
          * @param p     an ordered set of positional parameter strings
          */
-        XMLToolingException(const char* msg=NULL, const params& p=params());
+        XMLToolingException(const char* msg=nullptr, const params& p=params());
 
         /**
          * Constructs an exception using a message and named parameters.
@@ -185,7 +186,7 @@ namespace xmltooling {
          * 
          * @return  the processed message
          */
-        const char* what() const {return getMessage();}
+        const char* what() const throw () {return getMessage();}
 
         /**
          * Sets the error message.
@@ -240,7 +241,7 @@ namespace xmltooling {
          * Returns the parameter property with the designated position (based from one).
          * 
          * @param index     position to access
-         * @return  the parameter property or NULL
+         * @return  the parameter property or nullptr
          */
         const char* getProperty(unsigned int index) const;
 
@@ -248,7 +249,7 @@ namespace xmltooling {
          * Returns the parameter property with the designated name.
          * 
          * @param name     named parameter to access
-         * @return  the parameter property or NULL
+         * @return  the parameter property or nullptr
          */
         const char* getProperty(const char* name) const;
 
@@ -276,6 +277,14 @@ namespace xmltooling {
          */
         std::string toString() const;
 
+        /**
+         * Returns a set of query string name/value pairs, URL-encoded, representing the
+         * exception's type, message, and parameters.
+         *
+         * @return  the query string representation
+         */
+        std::string toQueryString() const;
+
     private:
         std::string m_msg;
         mutable std::string m_processedmsg;