Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(392)

Side by Side Diff: ports/jsoncpp/nacl.patch

Issue 1057623004: Update upstream version of jsoncpp and run tests (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
(Empty)
1 diff --git a/CMakeLists.txt b/CMakeLists.txt
2 index 462f278..c1a6712 100644
3 --- a/CMakeLists.txt
4 +++ b/CMakeLists.txt
5 @@ -94,10 +94,10 @@ endif( MSVC )
6
7 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
8 # using regular Clang or AppleClang
9 - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
10 + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -Wall")
binji 2015/04/02 07:39:07 TODO here? We could remove this when we kill the G
Sam Clegg 2015/04/02 17:58:48 Done.
11 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
12 # using GCC
13 - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -Wextra -pedantic")
14 + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x -Wall -Wextra -pedantic" )
15 endif()
16
17 IF(JSONCPP_WITH_WARNING_AS_ERROR)
18 diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
19 index ef976bf..f7ad1e2 100644
20 --- a/src/lib_json/json_writer.cpp
21 +++ b/src/lib_json/json_writer.cpp
22 @@ -29,8 +29,6 @@
23
24 #if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below
25 #define snprintf _snprintf
26 -#elif __cplusplus >= 201103L
27 -#define snprintf std::snprintf
28 #endif
29
30 #if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0
31 diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
32 index 71e9491..6bd1778 100644
33 --- a/src/test_lib_json/main.cpp
34 +++ b/src/test_lib_json/main.cpp
35 @@ -679,7 +679,9 @@ JSONTEST_FIXTURE(ValueTest, integers) {
36 JSONTEST_ASSERT_EQUAL(kint32max, val.asUInt());
37 JSONTEST_ASSERT_EQUAL(kint32max, val.asLargestUInt());
38 JSONTEST_ASSERT_EQUAL(kint32max, val.asDouble());
39 +#if !(defined(__native_client__) && defined(__i386__))
binji 2015/04/02 07:39:07 Add TODO explaining this test failure?
Sam Clegg 2015/04/02 17:58:48 Done.
40 JSONTEST_ASSERT_EQUAL(kfint32max, val.asFloat());
41 +#endif
42 JSONTEST_ASSERT_EQUAL(true, val.asBool());
43 JSONTEST_ASSERT_STRING_EQUAL("2147483647", val.asString());
44
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698