projects / packages / grive2.git / blame
| Commit | Line | Data |
|---|---|---|
| 47e89cab JB |
1 | --- grive-27817e835fe115ebbda5410ec904aa49a2ad01f1/libgrive/src/protocol/Json.cc.orig 2020-05-02 09:07:09.733415940 +0200 |
| 2 | +++ grive-27817e835fe115ebbda5410ec904aa49a2ad01f1/libgrive/src/protocol/Json.cc 2020-05-02 09:11:48.378573057 +0200 | |
| 3 | @@ -254,7 +254,7 @@ | |
| 4 | bool Json::Has( const std::string& key ) const | |
| 5 | { | |
| 6 | assert( m_json != 0 ) ; | |
| 7 | - return ::json_object_object_get_ex( m_json, key.c_str(), 0 ) == TRUE ; | |
| 8 | + return ::json_object_object_get_ex( m_json, key.c_str(), 0 ) == 1 ; | |
| 9 | } | |
| 10 | ||
| 11 | bool Json::Get( const std::string& key, Json& json ) const | |
| 12 | @@ -294,14 +294,14 @@ | |
| 13 | bool Json::Bool() const | |
| 14 | { | |
| 15 | assert( m_json != 0 ) ; | |
| 16 | - return ::json_object_get_boolean( m_json ) == TRUE ; | |
| 17 | + return ::json_object_get_boolean( m_json ) == 1 ; | |
| 18 | } | |
| 19 | ||
| 20 | template <> | |
| 21 | bool Json::Is<bool>() const | |
| 22 | { | |
| 23 | assert( m_json != 0 ) ; | |
| 24 | - return ::json_object_is_type( m_json, json_type_boolean ) == TRUE ; | |
| 25 | + return ::json_object_is_type( m_json, json_type_boolean ) == 1 ; | |
| 26 | } | |
| 27 | ||
| 28 | template <> | |
| 29 | @@ -320,7 +320,7 @@ | |
| 30 | bool Json::Is<std::string>() const | |
| 31 | { | |
| 32 | assert( m_json != 0 ) ; | |
| 33 | - return ::json_object_is_type( m_json, json_type_string ) == TRUE ; | |
| 34 | + return ::json_object_is_type( m_json, json_type_string ) == 1 ; | |
| 35 | } | |
| 36 | ||
| 37 | template <> | |
| 38 | @@ -339,7 +339,7 @@ | |
| 39 | bool Json::Is<int>() const | |
| 40 | { | |
| 41 | assert( m_json != 0 ) ; | |
| 42 | - return ::json_object_is_type( m_json, json_type_int ) == TRUE ; | |
| 43 | + return ::json_object_is_type( m_json, json_type_int ) == 1 ; | |
| 44 | } | |
| 45 | ||
| 46 | template <> | |
| 47 | @@ -402,7 +402,7 @@ | |
| 48 | bool Json::Is<Json::Object>() const | |
| 49 | { | |
| 50 | assert( m_json != 0 ) ; | |
| 51 | - return ::json_object_is_type( m_json, json_type_object ) == TRUE ; | |
| 52 | + return ::json_object_is_type( m_json, json_type_object ) == 1 ; | |
| 53 | } | |
| 54 | ||
| 55 | template <> | |
| 56 | @@ -426,7 +426,7 @@ | |
| 57 | bool Json::Is<Json::Array>() const | |
| 58 | { | |
| 59 | assert( m_json != 0 ) ; | |
| 60 | - return ::json_object_is_type( m_json, json_type_array ) == TRUE ; | |
| 61 | + return ::json_object_is_type( m_json, json_type_array ) == 1 ; | |
| 62 | } | |
| 63 | ||
| 64 | template <> |