cleanup
authorLuke Howard <lukeh@padl.com>
Mon, 28 Mar 2011 06:14:15 +0000 (17:14 +1100)
committerLuke Howard <lukeh@padl.com>
Mon, 28 Mar 2011 06:14:15 +0000 (17:14 +1100)
util_json.cpp

index 9b4b9d1..76cf31c 100644 (file)
 
 #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)