generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to use the new opensource jsoncpp and remove jsoncpp mods.

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/145001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@596 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org
2011-09-14 23:26:00 +00:00
parent 19eefdc9f0
commit b27f3f16b6
6 changed files with 40 additions and 2653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
third_party_mods/libjingle/libjingle.gyp
View File

@@ -15,6 +15,7 @@
'overrides': '<(libjingle_orig)/source',
}],
],
'jsoncpp': '../../third_party/jsoncpp',
},
'target_defaults': {
'defines': [
@@ -162,6 +163,41 @@
],
},
'targets': [
#TODO(ronghuawu): move jsoncpp target to its own gyp
{
'target_name': 'jsoncpp',
'type': '<(library)',
'defines': [
'JSON_USE_EXCEPTION=0',
],
'sources': [
'<(jsoncpp)/include/json/assertions.h',
'<(jsoncpp)/include/json/autolink.h',
'<(jsoncpp)/include/json/config.h',
'<(jsoncpp)/include/json/features.h',
'<(jsoncpp)/include/json/forwards.h',
'<(jsoncpp)/include/json/json.h',
'<(jsoncpp)/include/json/reader.h',
'<(jsoncpp)/include/json/value.h',
'<(jsoncpp)/include/json/writer.h',
'<(jsoncpp)/src/lib_json/json_batchallocator.h',
'<(jsoncpp)/src/lib_json/json_internalarray.inl',
'<(jsoncpp)/src/lib_json/json_internalmap.inl',
'<(jsoncpp)/src/lib_json/json_reader.cpp',
'<(jsoncpp)/src/lib_json/json_tool.h',
'<(jsoncpp)/src/lib_json/json_value.cpp',
'<(jsoncpp)/src/lib_json/json_valueiterator.inl',
'<(jsoncpp)/src/lib_json/json_writer.cpp',
],
'include_dirs': [
'<(jsoncpp)/include/',
],
'direct_dependent_settings': {
'include_dirs': [
'<(jsoncpp)/include/',
],
},
},
{
'target_name': 'libjingle',
'type': 'static_library',
@@ -385,7 +421,7 @@
}],
],
'dependencies': [
'../../third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
'jsoncpp',
],
},
# This has to be is a separate project due to a bug in MSVS:
@@ -573,7 +609,7 @@
'<(libjingle_mods)/source/talk/app/webrtc/webrtc_json.h',
],
'dependencies': [
'../../third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
'jsoncpp',
],
'conditions': [
['inside_chromium_build==1', {

2
third_party_mods/libjingle/source/talk/app/webrtc/webrtc_json.cc
View File

@@ -451,7 +451,7 @@ bool ParseICECandidates(const Json::Value& value,
std::vector<Json::Value> ReadValues(
const Json::Value& value, const std::string& key) {
std::vector<Json::Value> objects;
for (size_t i = 0; i < value[key].size(); ++i) {
for (Json::ArrayIndex i = 0; i < value[key].size(); ++i) {
objects.push_back(value[key][i]);
}
return objects;