chromium/src/third_party/jsoncpp.git
4 months agoGN: Add BUILD.gn file to third_party/jsoncpp master
kjellander@chromium.org [Thu, 12 Jun 2014 14:35:39 +0000 (14:35 +0000)]
GN: Add BUILD.gn file to third_party/jsoncpp

BUG=webrtc:3441
TEST=Successful build with WebRTC, see
https://review.webrtc.org/17669004/ for details.

Review URL: https://codereview.chromium.org/322373002

git-svn-id: http://src.chromium.org/svn/trunk/src/third_party/jsoncpp@276676 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

5 months agoRevert of Unconditionally include <string> and <iostream> in json_reader.cpp (https...
thakis@chromium.org [Mon, 19 May 2014 19:08:30 +0000 (19:08 +0000)]
Revert of Unconditionally include <string> and <iostream> in json_reader.cpp (https://codereview.chromium.org/291803003/)

Reason for revert:
This adds a static initializer.

Original issue's description:
> Unconditionally include <string> and <iostream> in json_reader.cpp
> Non-PNaCl builds that use libc++ also require these headers.
>
> BUG=None
> R=mallinath@chromium.org
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=271429

TBR=mallinath@chromium.org,ronghuawu@chromium.org,glider@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=None

Review URL: https://codereview.chromium.org/290923003

git-svn-id: http://src.chromium.org/svn/trunk/src/third_party/jsoncpp@271446 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

5 months agoUnconditionally include <string> and <iostream> in json_reader.cpp
glider@chromium.org [Mon, 19 May 2014 18:24:16 +0000 (18:24 +0000)]
Unconditionally include <string> and <iostream> in json_reader.cpp
Non-PNaCl builds that use libc++ also require these headers.

BUG=None
R=mallinath@chromium.org

Review URL: https://codereview.chromium.org/291803003

git-svn-id: http://src.chromium.org/svn/trunk/src/third_party/jsoncpp@271429 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

9 months agoRename _untrusted targets in third_party to use _nacl suffix
sergeyu@chromium.org [Thu, 16 Jan 2014 06:43:35 +0000 (06:43 +0000)]
Rename _untrusted targets in third_party to use _nacl suffix

Previously NaCl targets were using _untrusted suffix which makes the
purpose of these targets hard to understand. This CL renames some targets in src/third_party.

Also removed toolsets field from modp_b64_nacl.gyp

Review URL: https://codereview.chromium.org/138673002

git-svn-id: http://src.chromium.org/svn/trunk/src/third_party/jsoncpp@245176 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

10 months agoNaCl: Update revision in DEPS, r12488 -> r12497
binji@chromium.org [Sat, 7 Dec 2013 03:03:03 +0000 (03:03 +0000)]
NaCl: Update revision in DEPS, r12488 -> r12497

This pulls in the following Native Client changes:

r12489: (jfb) Build libc++/libc++abi with HAS_THREAD_LOCAL
r12490: (jvoung) PNaCl: Update LLVM test suite revision in pnacl/COMPONENT_REVISIONS
r12491: (jvoung) Add dashy repos (llvm-test-suite) to pnacl/deps_update.py
r12492: (mseaborn) Add tests for C++ exception types that use virtual base classes
r12493: (jfb) Update TOOL_REVISIONS for PNaCl 12483->12489
r12494: (mseaborn) PNaCl: Update libcxxabi revision in pnacl/COMPONENT_REVISIONS: SJLJ EH support
r12495: (jfb) Mark faultqueue test as broken on ARM.
r12496: (kschimpf) PNaCl: Update LLVM revision in pnacl/COMPONENT_REVISIONS
r12497: (mseaborn) Update PNaCl toolchain revision to r12494 to get SJLJ EH support for libc++

This pulls in libc++ as the default standard C++ library for PNaCl and allows SJLJ EH to work with libc++.

This also fixes out-of-bounds std::map access in nacl_io testing, and correspondingly broken test. All used  pass because libstdc++ just happened to return the expected value when out-of-bounds, but libc++ doesn't return the same thing and the tests now appeared broken.

BUG=none
TEST=nacl_integration
R=binji@chromium.org, dschuff@chromium.org, ronghuawu@chromium.org

Review URL: https://codereview.chromium.org/98713004

git-svn-id: http://src.chromium.org/svn/trunk/src/third_party/jsoncpp@239294 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

11 months agoAdd an untrusted NaCl build target for jsoncpp.
plundblad@chromium.org [Sat, 9 Nov 2013 01:46:29 +0000 (01:46 +0000)]
Add an untrusted NaCl build target for jsoncpp.

BUG=316353
R=mallinath@chromium.org,ronghuawu@chromium.org
CC=bradnelson@chromium.org,dmazzoni@chromium.org,dtseng@chromium.org,aboxhall@chromium.org

Review URL: https://codereview.chromium.org/62953015

git-svn-id: http://src.chromium.org/svn/trunk/src/third_party/jsoncpp@234073 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

12 months agojsoncpp: force alignment of Json::Value::null to avoid crashes on ARM.
fischman@chromium.org [Tue, 1 Oct 2013 01:03:54 +0000 (01:03 +0000)]
jsoncpp: force alignment of Json::Value::null to avoid crashes on ARM.

BUG=109997,https://code.google.com/p/webrtc/issues/detail?id=1777

Review URL: https://codereview.chromium.org/24984004

git-svn-id: http://src.chromium.org/svn/trunk/src/third_party/jsoncpp@226099 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

16 months agoAdd OWNERS file for jsoncpp.
ronghuawu@chromium.org [Tue, 11 Jun 2013 18:23:05 +0000 (18:23 +0000)]
Add OWNERS file for jsoncpp.

R=mallinath@chromium.org, parisa@chromium.org

Review URL: https://codereview.chromium.org/16691006

git-svn-id: http://src.chromium.org/svn/trunk/src/third_party/jsoncpp@205592 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

17 months agoExtract use_system_foo logic out of gyp files, patch 2
phajdan.jr@chromium.org [Fri, 26 Apr 2013 00:20:29 +0000 (00:20 +0000)]
Extract use_system_foo logic out of gyp files, patch 2

This removes use_system_foo logic completely from:
 * jsoncpp.gyp
 * libevent.gyp
 * libpng.gyp
 * libusb.gyp
 * libwebp.gyp
 * opus.gyp
 * re2.gyp
 * zlib.gyp

R=rsleevi
TBR=darin

BUG=226860

Review URL: https://codereview.chromium.org/14203006

git-svn-id: http://src.chromium.org/svn/trunk/src/third_party/jsoncpp@196551 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

20 months agoLinux: adjust include path for system jsoncpp.
phajdan.jr@chromium.org [Tue, 19 Feb 2013 10:00:54 +0000 (10:00 +0000)]
Linux: adjust include path for system jsoncpp.

This makes it consistent with convention on Debian, Ubuntu,
Arch, and Gentoo (after https://bugs.gentoo.org/show_bug.cgi?id=452234
gets fixed).

R=ronghuawu
TBR=darin

BUG=none

Review URL: https://codereview.chromium.org/12294017

git-svn-id: http://src.chromium.org/svn/trunk/src/third_party/jsoncpp@183190 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

21 months agoLinux: add an option to use system jsoncpp
phajdan.jr@chromium.org [Thu, 3 Jan 2013 18:02:36 +0000 (18:02 +0000)]
Linux: add an option to use system jsoncpp

BUG=none

Review URL: https://codereview.chromium.org/11737009

git-svn-id: http://src.chromium.org/svn/trunk/src/third_party/jsoncpp@174979 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

2 years agoCreate a local mod (based on jsoncpp trunk r248) to remove the static initialization... git-svn
ronghuawu@chromium.org [Thu, 12 Jan 2012 21:41:38 +0000 (21:41 +0000)]
Create a local mod (based on jsoncpp trunk r248) to remove the static initialization caused by the global variable Value::null.

BUG=109997
TEST=unittests

Review URL: http://codereview.chromium.org/9188042

git-svn-id: http://src.chromium.org/svn/trunk/src/third_party/jsoncpp@117516 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

2 years agoAdd svn:ignore for jsoncpp/source
nsylvain@chromium.org [Mon, 24 Oct 2011 17:52:15 +0000 (17:52 +0000)]
Add svn:ignore for jsoncpp/source

git-svn-id: http://src.chromium.org/svn/trunk/src/third_party/jsoncpp@106942 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

2 years agoAdd jsoncpp in DEPS and the gyp file to build jsoncpp in chromium.
ronghuawu@google.com [Sat, 22 Oct 2011 00:33:19 +0000 (00:33 +0000)]
Add jsoncpp in DEPS and the gyp file to build jsoncpp in chromium.

The jsoncpp is needed by libjingle as part of the webrtc effort. This patch probably not be the best solution as there's already one chrome json parser in base and another jsoncpp copy in native_client. However since the libjingle can depend on neither of them, here comes this patch. We hope to take this patch as a chance to get some advices on how should we handle this case.

BUGS=none
TEST=none

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=106424

Review URL: http://codereview.chromium.org/8251003

git-svn-id: http://src.chromium.org/svn/trunk/src/third_party/jsoncpp@106815 4ff67af0-8c30-449e-8e8b-ad334ec8d88c