6776518bea
This refactoring takes a careful approach to avoid rushing the change: * stub headers are left in all the old locations of webrtc/base * existing GN targets are kept and now just forward to the moved ones using public_deps. The only exception to the above is the base_java target and its .java files, which were moved to webrtc/rtc_base right away since it's not possible to use public_deps for android_library. To avoid breaking builds, a temporary Dummy.java file was added to the new intermediate target in webrtc/rtc_base:base_java as well to avoid hitting a GN assert in the android_library template. The above approach should make the transition smooth without breaking downstream. A helper script was created (https://codereview.webrtc.org/2879203002/) and was run like this: stub-headers.py -s webrtc/base -d webrtc/rtc_base -i 7634 stub-headers.py -s webrtc/base/numerics -d webrtc/rtc_base/numerics -i 7634 Fixed invalid header guards in the following files: webrtc/base/base64.h webrtc/base/cryptstring.h webrtc/base/event.h webrtc/base/flags.h webrtc/base/httpbase.h webrtc/base/httpcommon-inl.h webrtc/base/httpcommon.h webrtc/base/httpserver.h webrtc/base/logsinks.h webrtc/base/macutils.h webrtc/base/nattypes.h webrtc/base/openssladapter.h webrtc/base/opensslstreamadapter.h webrtc/base/pathutils.h webrtc/base/physicalsocketserver.h webrtc/base/proxyinfo.h webrtc/base/sigslot.h webrtc/base/sigslotrepeater.h webrtc/base/socket.h webrtc/base/socketaddresspair.h webrtc/base/socketfactory.h webrtc/base/stringutils.h webrtc/base/testbase64.h webrtc/base/testutils.h webrtc/base/transformadapter.h webrtc/base/win32filesystem.h Added new header guards to: sslroots.h testbase64.h BUG=webrtc:7634 NOTRY=True NOPRESUBMIT=True R=kwiberg@webrtc.org Review-Url: https://codereview.webrtc.org/2877023002 . Cr-Commit-Position: refs/heads/master@{#18816}
92 lines
3.8 KiB
C++
92 lines
3.8 KiB
C++
/*
|
|
* Copyright 2004 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef WEBRTC_RTC_BASE_JSON_H_
|
|
#define WEBRTC_RTC_BASE_JSON_H_
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#if !defined(WEBRTC_EXTERNAL_JSON)
|
|
#include "json/json.h"
|
|
#else
|
|
#include "third_party/jsoncpp/json.h"
|
|
#endif
|
|
|
|
namespace rtc {
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// JSON Helpers
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
// Robust conversion operators, better than the ones in JsonCpp.
|
|
bool GetIntFromJson(const Json::Value& in, int* out);
|
|
bool GetUIntFromJson(const Json::Value& in, unsigned int* out);
|
|
bool GetStringFromJson(const Json::Value& in, std::string* out);
|
|
bool GetBoolFromJson(const Json::Value& in, bool* out);
|
|
bool GetDoubleFromJson(const Json::Value& in, double* out);
|
|
|
|
// Pull values out of a JSON array.
|
|
bool GetValueFromJsonArray(const Json::Value& in, size_t n,
|
|
Json::Value* out);
|
|
bool GetIntFromJsonArray(const Json::Value& in, size_t n,
|
|
int* out);
|
|
bool GetUIntFromJsonArray(const Json::Value& in, size_t n,
|
|
unsigned int* out);
|
|
bool GetStringFromJsonArray(const Json::Value& in, size_t n,
|
|
std::string* out);
|
|
bool GetBoolFromJsonArray(const Json::Value& in, size_t n,
|
|
bool* out);
|
|
bool GetDoubleFromJsonArray(const Json::Value& in, size_t n,
|
|
double* out);
|
|
|
|
// Convert json arrays to std::vector
|
|
bool JsonArrayToValueVector(const Json::Value& in,
|
|
std::vector<Json::Value>* out);
|
|
bool JsonArrayToIntVector(const Json::Value& in,
|
|
std::vector<int>* out);
|
|
bool JsonArrayToUIntVector(const Json::Value& in,
|
|
std::vector<unsigned int>* out);
|
|
bool JsonArrayToStringVector(const Json::Value& in,
|
|
std::vector<std::string>* out);
|
|
bool JsonArrayToBoolVector(const Json::Value& in,
|
|
std::vector<bool>* out);
|
|
bool JsonArrayToDoubleVector(const Json::Value& in,
|
|
std::vector<double>* out);
|
|
|
|
// Convert std::vector to json array
|
|
Json::Value ValueVectorToJsonArray(const std::vector<Json::Value>& in);
|
|
Json::Value IntVectorToJsonArray(const std::vector<int>& in);
|
|
Json::Value UIntVectorToJsonArray(const std::vector<unsigned int>& in);
|
|
Json::Value StringVectorToJsonArray(const std::vector<std::string>& in);
|
|
Json::Value BoolVectorToJsonArray(const std::vector<bool>& in);
|
|
Json::Value DoubleVectorToJsonArray(const std::vector<double>& in);
|
|
|
|
// Pull values out of a JSON object.
|
|
bool GetValueFromJsonObject(const Json::Value& in, const std::string& k,
|
|
Json::Value* out);
|
|
bool GetIntFromJsonObject(const Json::Value& in, const std::string& k,
|
|
int* out);
|
|
bool GetUIntFromJsonObject(const Json::Value& in, const std::string& k,
|
|
unsigned int* out);
|
|
bool GetStringFromJsonObject(const Json::Value& in, const std::string& k,
|
|
std::string* out);
|
|
bool GetBoolFromJsonObject(const Json::Value& in, const std::string& k,
|
|
bool* out);
|
|
bool GetDoubleFromJsonObject(const Json::Value& in, const std::string& k,
|
|
double* out);
|
|
|
|
// Writes out a Json value as a string.
|
|
std::string JsonValueToString(const Json::Value& json);
|
|
|
|
} // namespace rtc
|
|
|
|
#endif // WEBRTC_RTC_BASE_JSON_H_
|