| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #ifndef WEBRTC_BASE_JSON_H_ | 11 #ifndef WEBRTC_RTC_BASE_JSON_H_ |
| 12 #define WEBRTC_BASE_JSON_H_ | 12 #define WEBRTC_RTC_BASE_JSON_H_ |
| 13 | 13 |
| 14 #include <string> | 14 #include <string> |
| 15 #include <vector> | 15 #include <vector> |
| 16 | 16 |
| 17 #if !defined(WEBRTC_EXTERNAL_JSON) | 17 #if !defined(WEBRTC_EXTERNAL_JSON) |
| 18 #include "json/json.h" | 18 #include "json/json.h" |
| 19 #else | 19 #else |
| 20 #include "third_party/jsoncpp/json.h" | 20 #include "third_party/jsoncpp/json.h" |
| 21 #endif | 21 #endif |
| 22 | 22 |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 bool GetBoolFromJsonObject(const Json::Value& in, const std::string& k, | 81 bool GetBoolFromJsonObject(const Json::Value& in, const std::string& k, |
| 82 bool* out); | 82 bool* out); |
| 83 bool GetDoubleFromJsonObject(const Json::Value& in, const std::string& k, | 83 bool GetDoubleFromJsonObject(const Json::Value& in, const std::string& k, |
| 84 double* out); | 84 double* out); |
| 85 | 85 |
| 86 // Writes out a Json value as a string. | 86 // Writes out a Json value as a string. |
| 87 std::string JsonValueToString(const Json::Value& json); | 87 std::string JsonValueToString(const Json::Value& json); |
| 88 | 88 |
| 89 } // namespace rtc | 89 } // namespace rtc |
| 90 | 90 |
| 91 #endif // WEBRTC_BASE_JSON_H_ | 91 #endif // WEBRTC_RTC_BASE_JSON_H_ |
| OLD | NEW |