Reverted changes where I used a macro for a noexcept replacement - we'll prefer to use C++11 unadorned.

Author: glynos

http/src/http/v2/client/client.cpp

@@ -50,7 +50,7 @@ namespace network {
 
 	explicit impl(client_options options);
 
-	~impl() NETWORK_NOEXCEPT;
+	~impl() noexcept;
 
         void connect(client::string_type host,
                      const boost::system::error_code &ec,
@@ -91,7 +91,7 @@ namespace network {
 
       }
 
-      client::impl::~impl() NETWORK_NOEXCEPT {
+      client::impl::~impl() noexcept {
 	sentinel_.reset();
 	lifetime_thread_.join();
       }
@@ -170,7 +170,7 @@ namespace network {
 
       }
 
-      client::~client() NETWORK_NOEXCEPT {
+      client::~client() noexcept {
 	delete pimpl_;
       }
 

http/src/http/v2/client/client_errors.cpp

@@ -16,19 +16,19 @@ namespace network {
 
 	client_category_impl() = default;
 
-	virtual ~client_category_impl() NETWORK_NOEXCEPT;
+	virtual ~client_category_impl() noexcept;
 
-	virtual const char *name() const NETWORK_NOEXCEPT;
+	virtual const char *name() const noexcept;
 
 	virtual std::string message(int ev) const;
 
       };
 
-      client_category_impl::~client_category_impl() NETWORK_NOEXCEPT {
+      client_category_impl::~client_category_impl() noexcept {
 
       }
 
-      const char *client_category_impl::name() const NETWORK_NOEXCEPT {
+      const char *client_category_impl::name() const noexcept {
 	static const char name[] = "client_error";
 	return name;
       }
@@ -63,7 +63,7 @@ namespace network {
 
       }
 
-      invalid_url::~invalid_url() NETWORK_NOEXCEPT {
+      invalid_url::~invalid_url() noexcept {
 
       }
 

http/src/network/http/v2/client/client.hpp

@@ -69,14 +69,14 @@ namespace network {
         /**
          * \brief Destructor.
          */
-        ~client_options() NETWORK_NOEXCEPT {
+        ~client_options() noexcept {
 
         }
 
         /**
          * \brief Swap.
          */
-        void swap(client_options &other) NETWORK_NOEXCEPT {
+        void swap(client_options &other) noexcept {
           using std::swap;
           std::swap(io_service_, other.io_service_);
           swap(follow_redirects_, other.follow_redirects_);
@@ -228,7 +228,7 @@ namespace network {
       };
 
       inline
-      void swap(client_options &lhs, client_options &rhs) NETWORK_NOEXCEPT {
+      void swap(client_options &lhs, client_options &rhs) noexcept {
         lhs.swap(rhs);
       }
 
@@ -259,7 +259,7 @@ namespace network {
         /**
          * Destructor.
          */
-        ~client() NETWORK_NOEXCEPT;
+        ~client() noexcept;
 
         /**
          * \brief Makes an HTTP GET request.

http/src/network/http/v2/client/client_errors.hpp

@@ -68,7 +68,7 @@ namespace network {
 	/**
 	 * \brief Destructor.
 	 */
-	virtual ~invalid_url() NETWORK_NOEXCEPT;
+	virtual ~invalid_url() noexcept;
 
       };
 
@@ -89,7 +89,7 @@ namespace network {
 	/**
 	 * \brief Destructor.
 	 */
-	virtual ~resolver_error() NETWORK_NOEXCEPT;
+	virtual ~resolver_error() noexcept;
 
       };
 
@@ -111,7 +111,7 @@ namespace network {
 	/**
 	 * \brief Destructor.
 	 */
-	virtual ~connection_error() NETWORK_NOEXCEPT;
+	virtual ~connection_error() noexcept;
 
       };
 
@@ -132,7 +132,7 @@ namespace network {
 	/**
 	 * \brief Destructor.
 	 */
-        virtual ~response_error() NETWORK_NOEXCEPT;
+        virtual ~response_error() noexcept;
 
       };
     } // namespace v2

http/src/network/http/v2/client/connection/async_resolver.hpp

@@ -56,7 +56,7 @@ namespace network {
         /**
          * \brief Destructor.
          */
-        ~async_resolver() NETWORK_NOEXCEPT {
+        ~async_resolver() noexcept {
 
         }
 

http/src/network/http/v2/client/connection/connection.hpp

@@ -50,7 +50,7 @@ namespace network {
         /**
          * \brief Destructor.
          */
-        virtual ~connection() NETWORK_NOEXCEPT { }
+        virtual ~connection() noexcept { }
 
         /**
          * \brief Asynchronously creates a connection to an endpoint.

http/src/network/http/v2/client/connection/normal_connection.hpp

@@ -28,7 +28,7 @@ namespace network {
 
         }
 
-        virtual ~normal_connection() NETWORK_NOEXCEPT {
+        virtual ~normal_connection() noexcept {
 
         }
 

http/src/network/http/v2/client/connection/ssl_connection.hpp

@@ -33,7 +33,7 @@ namespace network {
 
 	}
 
-	virtual ~ssl_connection() NETWORK_NOEXCEPT {
+	virtual ~ssl_connection() noexcept {
 
 	}
 

http/src/network/http/v2/client/request.hpp

@@ -72,11 +72,11 @@ namespace network {
         /**
          * \brief Destructor.
          */
-        ~request_options() NETWORK_NOEXCEPT {
+        ~request_options() noexcept {
 
         }
 
-        void swap(request_options &other) NETWORK_NOEXCEPT {
+        void swap(request_options &other) noexcept {
           using std::swap;
           swap(resolve_timeout_, other.resolve_timeout_);
           swap(read_timeout_, other.read_timeout_);
@@ -129,7 +129,7 @@ namespace network {
       };
 
       inline
-      void swap(request_options &lhs, request_options &rhs) NETWORK_NOEXCEPT {
+      void swap(request_options &lhs, request_options &rhs) noexcept {
         lhs.swap(rhs);
       }
 
@@ -158,7 +158,7 @@ namespace network {
         /**
          * \brief Destructor.
          */
-        virtual ~byte_source() NETWORK_NOEXCEPT {}
+        virtual ~byte_source() noexcept {}
 
         /**
          * \brief Allows the request to read the data into a local
@@ -271,7 +271,7 @@ namespace network {
         /**
          * \brief Move constructor.
          */
-        request(request &&other) NETWORK_NOEXCEPT
+        request(request &&other) noexcept
           : method_(std::move(other.method_))
           , path_(std::move(other.path_))
           , version_(std::move(other.version_))
@@ -289,14 +289,14 @@ namespace network {
         /**
          * \brief Destructor.
          */
-        ~request() NETWORK_NOEXCEPT {
+        ~request() noexcept {
 
         }
 
         /**
          * \brief Swap.
          */
-        void swap(request &other) NETWORK_NOEXCEPT {
+        void swap(request &other) noexcept {
           using std::swap;
           swap(method_, other.method_);
           swap(path_, other.path_);
@@ -412,7 +412,7 @@ namespace network {
       };
 
       inline
-      void swap(request &lhs, request &rhs) NETWORK_NOEXCEPT {
+      void swap(request &lhs, request &rhs) noexcept {
         lhs.swap(rhs);
       }
     } // namespace v2

http/src/network/http/v2/client/response.hpp

@@ -73,7 +73,7 @@ namespace network {
          * \brief Move constructor.
          * \param other The other response object.
          */
-	response(response &&other) NETWORK_NOEXCEPT
+	response(response &&other) noexcept
           : version_(std::move(other.version_))
           , status_(std::move(other.status_))
           , status_message_(std::move(other.status_message_))
@@ -94,7 +94,7 @@ namespace network {
          * \brief Swap function.
          * \param other The other response object.
          */
-	void swap(response &other) NETWORK_NOEXCEPT {
+	void swap(response &other) noexcept {
           using std::swap;
 	  swap(version_, other.version_);
 	  swap(status_, other.status_);
@@ -153,7 +153,7 @@ namespace network {
       };
 
       inline
-      void swap(response &lhs, response &rhs) NETWORK_NOEXCEPT {
+      void swap(response &lhs, response &rhs) noexcept {
         lhs.swap(rhs);
       }
     } // namespace v2