Merge pull request #13 from jgriffiths/misc

Two minor fixes

Author: cinemast

include/jsonrpccxx/client.hpp

@@ -59,6 +59,8 @@ namespace jsonrpccxx {
         json response = json::parse(connector.Send(j.dump()));
         if (has_key_type(response, "error", json::value_t::object)) {
           throw JsonRpcException::fromJson(response["error"]);
+        } else if (has_key_type(response, "error", json::value_t::string)) {
+          throw JsonRpcException(-32603, response["error"]);
         }
         if (has_key(response, "result") && has_key(response, "id")) {
           if (response["id"].type() == json::value_t::string)

include/jsonrpccxx/common.hpp

@@ -1,5 +1,4 @@
 #pragma once
-#include "common.hpp"
 #include "nlohmann/json.hpp"
 #include <exception>
 #include <string>
@@ -46,4 +45,4 @@ namespace jsonrpccxx {
     json data;
     std::string err;
   };
-} // namespace jsonrpccxx
+} // namespace jsonrpccxx