From: Luke Howard Date: Mon, 28 Mar 2011 06:14:15 +0000 (+1100) Subject: cleanup X-Git-Tag: dvd/201105~12^2~50 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.orig;a=commitdiff_plain;h=8ea44a05a9f6a308c71e5ed4e0c4b513f830b3a6 cleanup --- diff --git a/util_json.cpp b/util_json.cpp index 9b4b9d1..76cf31c 100644 --- a/util_json.cpp +++ b/util_json.cpp @@ -51,20 +51,21 @@ #define JSON_CHECK_CONTAINER() do { \ if (!json_is_object(m_obj) && !json_is_array(m_obj)) { \ - std::string s("JSONObject object is not a container"); \ + std::string s("JSONObject is not a container"); \ throw new std::runtime_error(s); \ } \ } while (0) + #define JSON_CHECK_OBJECT() do { \ if (!json_is_object(m_obj)) { \ - std::string s("JSONObject object is not a dictionary"); \ + std::string s("JSONObject is not a dictionary"); \ throw new std::runtime_error(s); \ } \ } while (0) #define JSON_CHECK_ARRAY() do { \ if (!json_is_array(m_obj)) { \ - std::string s("JSONObject object is not an array"); \ + std::string s("JSONObject is not an array"); \ throw new std::runtime_error(s); \ } \ } while (0)