invalid_url is now a base class of std::invalid_argument, instead of std::system_error.

glynos · glynos · commit 93098aeb093c · 2013-12-17T20:45:31.000+01:00
diff --git a/http/src/http/v2/client/client_errors.cpp b/http/src/http/v2/client/client_errors.cpp
@@ -35,8 +35,7 @@ namespace network {
 
       std::string client_category_impl::message(int ev) const {
 	switch (client_error(ev)) {
-	case client_error::invalid_url:
-	  return "Requires HTTP or HTTPS URL.";
+
 	case client_error::invalid_request:
 	  return "Invalid HTTP request.";
         case client_error::host_not_found:
@@ -59,7 +58,7 @@ namespace network {
       }
 
       invalid_url::invalid_url()
-	: std::system_error(make_error_code(client_error::invalid_url)) {
+        : std::invalid_argument("Requires HTTP or HTTPS URL.") {
 
       }
 
diff --git a/http/src/network/http/v2/client/client_errors.hpp b/http/src/network/http/v2/client/client_errors.hpp
@@ -12,8 +12,9 @@
  *        clients.
  */
 
-#include <network/config.hpp>
 #include <system_error>
+#include <stdexcept>
+#include <network/config.hpp>
 
 namespace network {
   namespace http {
@@ -24,9 +25,6 @@ namespace network {
        * \brief An enumeration of all types of client error.
        */
       enum class client_error {
-        // url
-        invalid_url,
-
         // request
         invalid_request,
 
@@ -52,7 +50,7 @@ namespace network {
        * \class invalid_url network/http/v2/client/client_errors.hpp network/http/v2/client.hpp
        * \brief An exception thrown if the URL provides is invalid.
        */
-      class invalid_url : public std::system_error {
+      class invalid_url : public std::invalid_argument {
 
       public:
 

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,7 @@ namespace network {`
`35`	`35`
`36`	`36`	`std::string client_category_impl::message(int ev) const {`
`37`	`37`	`switch (client_error(ev)) {`
`38`		`- case client_error::invalid_url:`
`39`		`- return "Requires HTTP or HTTPS URL.";`
	`38`	`+`
`40`	`39`	`case client_error::invalid_request:`
`41`	`40`	`return "Invalid HTTP request.";`
`42`	`41`	`case client_error::host_not_found:`
`@@ -59,7 +58,7 @@ namespace network {`
`59`	`58`	`}`
`60`	`59`
`61`	`60`	`invalid_url::invalid_url()`
`62`		`- : std::system_error(make_error_code(client_error::invalid_url)) {`
	`61`	`+ : std::invalid_argument("Requires HTTP or HTTPS URL.") {`
`63`	`62`
`64`	`63`	`}`
`65`	`64`