<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bf770c16875002b4552bca12ccfa38cc8b5e000b">https://github.com/macports/macports-ports/commit/bf770c16875002b4552bca12ccfa38cc8b5e000b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bf770c16875002b4552bca12ccfa38cc8b5e000b
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Mon Mar 6 12:35:07 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> rapidjson-devel: update to current upstream, update patches and variants
</span>---
devel/rapidjson-devel/Portfile | 67 ++-
.../0001-CMakeLists-fix-optflags-for-ppc.patch | 31 ++
...sign-conversion-Wno-sign-compare-with-GCC.patch | 22 +
....diff => 0003-Remove-valgrind-from-tests.patch} | 17 +-
.../files/patch-CMakeLists-arch.diff | 32 --
.../files/patch-rapidjson-devel-no-Werror.diff | 22 -
.../files/patch-test-CmakeLists.txt.diff | 27 --
.../rapidjson-devel/files/patch-test-unittest.diff | 489 ---------------------
8 files changed, 113 insertions(+), 594 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/rapidjson-devel/Portfile b/devel/rapidjson-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 550a24c4193..078ec292cff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/rapidjson-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/rapidjson-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,16 +4,14 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# the last release version 1.1.0 is apparently not fully usable at present
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://github.com/macports/macports-ports/pull/1738
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup Tencent rapidjson b32cd9421c5e3cbe183a99b6537ce11441e50656
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20180424
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup Tencent rapidjson 012be8528783cdbf4b7a9e64f78bd8f056b97e24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20230112
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> name rapidjson-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a0211ac1dc84270169b59c584894a0f49d0030a8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4133516f8fd578053f478f3b6211ebcfb03056bdd59d6c6d0312c393f467cf37 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1049113
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 dab3323f98ab4f1cab778eb3ef0a69fa3b3f4685 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1e242ca6cb5ae1ee0cf85802606638d04ec7ba90cf983a1295e2631856ead256 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1115362
</span>
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,23 +30,52 @@ long_description RapidJSON is a fast, unicode-friendly, self-cont
</span> # https website is misconfigured
homepage http://rapidjson.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Disbled Valgrind because it's apparently failing not due to issues with RapidJSON but rather macOS itself.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-test-CmakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-test-unittest.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-test-unittest-CmakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-CMakeLists-arch.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-rapidjson-devel-no-Werror.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+installs_libs no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append bin:doxygen:doxygen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-CMakeLists-fix-optflags-for-ppc.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-Wno-sign-conversion-Wno-sign-compare-with-GCC.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-Remove-valgrind-from-tests.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span>
configure.args-append -DRAPIDJSON_HAS_STDSTRING=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DRAPIDJSON_HAS_CXX11_RVALUE_REFS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DRAPIDJSON_BUILD_DOC=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DRAPIDJSON_BUILD_EXAMPLES=OFF \
</span> -DRAPIDJSON_BUILD_TESTS=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant tests description {Build and run unit tests.} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:gtest
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DRAPIDJSON_BUILD_TESTS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant docs description {Build documentation} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/doxygen:doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/dot:graphviz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -DRAPIDJSON_BUILD_DOC=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant examples description {Build examples} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -DRAPIDJSON_BUILD_EXAMPLES=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset examples]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/share/examples
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/share/doc/RapidJSON/examples \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/examples/RapidJSON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Otherwise destroot code fails:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${cmake.build_dir}/bin/archivertest ${cmake.build_dir}/bin/archiver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach example [glob -tails -directory ${cmake.build_dir}/bin *] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${cmake.build_dir}/bin/${example} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/examples/RapidJSON/${example}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/share/doc/RapidJSON/examples
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant tests description {Build and run unit tests} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/Tencent/rapidjson/issues/2118
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # depends_build-append port:gtest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # configure.args-append -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -DGTEST_SOURCE_DIR=${prefix}/src/googletest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_TESTS=ON
</span> test.run yes
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/rapidjson-devel/files/0001-CMakeLists-fix-optflags-for-ppc.patch b/devel/rapidjson-devel/files/0001-CMakeLists-fix-optflags-for-ppc.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8b0ce7fc997
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/rapidjson-devel/files/0001-CMakeLists-fix-optflags-for-ppc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 02f92f1f6604d08d41eebdd5cac89b84473814da Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 6 Mar 2023 07:50:16 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/3] CMakeLists: fix optflags for ppc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMakeLists.txt | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f8927b49..772d79ed 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,7 +68,7 @@ endif(CCACHE_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(RAPIDJSON_ENABLE_INSTRUMENTATION_OPT AND NOT CMAKE_CROSSCOMPILING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_OSX_ARCHITECTURES MATCHES "ppc|ppc64")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,7 +102,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT CMAKE_CROSSCOMPILING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_OSX_ARCHITECTURES MATCHES "ppc|ppc64")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/rapidjson-devel/files/0002-Wno-sign-conversion-Wno-sign-compare-with-GCC.patch b/devel/rapidjson-devel/files/0002-Wno-sign-conversion-Wno-sign-compare-with-GCC.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..aae15709452
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/rapidjson-devel/files/0002-Wno-sign-conversion-Wno-sign-compare-with-GCC.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c6c40c626d90ae2f5d210d245649e9c936f15cbd Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 6 Mar 2023 08:29:07 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/3] -Wno-sign-conversion, -Wno-sign-compare with GCC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMakeLists.txt | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 772d79ed..ca5cd262 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,7 +76,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wsign-conversion)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wno-sign-conversion -Wno-sign-compare)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (RAPIDJSON_BUILD_CXX11 AND CMAKE_VERSION VERSION_LESS 3.1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7.0")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/rapidjson-devel/files/patch-test-unittest-CmakeLists.txt.diff b/devel/rapidjson-devel/files/0003-Remove-valgrind-from-tests.patch
</span>similarity index 53%
rename from devel/rapidjson-devel/files/patch-test-unittest-CmakeLists.txt.diff
rename to devel/rapidjson-devel/files/0003-Remove-valgrind-from-tests.patch
<span style='display:block; white-space:pre;color:#808080;'>index 6d886d5c4b0..baff6653e89 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/rapidjson-devel/files/patch-test-unittest-CmakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/rapidjson-devel/files/0003-Remove-valgrind-from-tests.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-// Remove Valgrind from unittests as it is currently failing (apparently) mostly to issues not related to RapidJSON.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 01079f677de1048f9447dd32a73e664a65ce4c51 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 6 Mar 2023 10:49:26 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3/3] Remove valgrind from tests
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/unittest/CMakeLists.txt.orig 2018-05-05 17:09:28.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/unittest/CMakeLists.txt 2018-05-05 17:09:47.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -78,11 +78,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test/unittest/CMakeLists.txt | 5 -----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/test/unittest/CMakeLists.txt b/test/unittest/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 565ed982..bfd90afa 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/unittest/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/unittest/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,11 +81,6 @@ add_test(NAME unittest
</span> WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
if(NOT MSVC)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/rapidjson-devel/files/patch-CMakeLists-arch.diff b/devel/rapidjson-devel/files/patch-CMakeLists-arch.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8509f659fc7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/rapidjson-devel/files/patch-CMakeLists-arch.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.orig.txt 2022-12-23 08:11:02.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2022-12-23 08:11:54.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,14 +56,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(CCACHE_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(RAPIDJSON_ENABLE_INSTRUMENTATION_OPT AND NOT CMAKE_CROSSCOMPILING)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wsign-conversion)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (RAPIDJSON_BUILD_CXX11 AND CMAKE_VERSION VERSION_LESS 3.1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -88,14 +80,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(NOT CMAKE_CROSSCOMPILING)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-missing-field-initializers")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wimplicit-fallthrough)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (RAPIDJSON_BUILD_CXX11 AND CMAKE_VERSION VERSION_LESS 3.1)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/rapidjson-devel/files/patch-rapidjson-devel-no-Werror.diff b/devel/rapidjson-devel/files/patch-rapidjson-devel-no-Werror.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a30525ed32d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/rapidjson-devel/files/patch-rapidjson-devel-no-Werror.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b67f482..a874522 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,7 +67,7 @@ if(CCACHE_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(CCACHE_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wsign-conversion)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (RAPIDJSON_BUILD_CXX11 AND CMAKE_VERSION VERSION_LESS 3.1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7.0")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -93,7 +93,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-missing-field-initializers")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-missing-field-initializers")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wimplicit-fallthrough)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (RAPIDJSON_BUILD_CXX11 AND CMAKE_VERSION VERSION_LESS 3.1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/rapidjson-devel/files/patch-test-CmakeLists.txt.diff b/devel/rapidjson-devel/files/patch-test-CmakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2bc102b037b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/rapidjson-devel/files/patch-test-CmakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/CMakeLists.txt.orig 2018-05-03 19:17:38.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/CMakeLists.txt 2018-05-03 19:19:01.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,20 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--find_package(GTestSrc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+find_package(GTest REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IF(GTESTSRC_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IF(GTEST_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enable_testing()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (WIN32 AND (NOT CYGWIN) AND (NOT MINGW))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(gtest_disable_pthreads ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(gtest_force_shared_crt ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_BINARY_DIR}/googletest)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_directories(SYSTEM ${GTEST_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(TEST_LIBRARIES gtest gtest_main)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_custom_target(tests ALL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(perftest)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(unittest)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ENDIF(GTESTSRC_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ENDIF(GTEST_FOUND)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/rapidjson-devel/files/patch-test-unittest.diff b/devel/rapidjson-devel/files/patch-test-unittest.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8a0f6522fc3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/rapidjson-devel/files/patch-test-unittest.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,489 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ur test/unittest/cursorstreamwrappertest.cpp.orig test/unittest/cursorstreamwrappertest.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/unittest/cursorstreamwrappertest.cpp.orig 2018-04-24 23:13:00.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/unittest/cursorstreamwrappertest.cpp 2018-05-05 01:37:31.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,8 +38,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t col, line;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool ret = testJson(json, line, col);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(ret);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(line, 3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(col, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(line), 3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(col), 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST(CursorStreamWrapper, MissingQuotes) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,8 +47,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t col, line;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool ret = testJson(json, line, col);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(ret);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(line, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(col, 8);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(line), 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(col), 8);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST(CursorStreamWrapper, MissingColon) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,8 +56,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t col, line;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool ret = testJson(json, line, col);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(ret);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(line, 3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(col, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(line), 3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(col), 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST(CursorStreamWrapper, MissingSecondQuotes) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,8 +65,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t col, line;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool ret = testJson(json, line, col);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(ret);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(line, 3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(col, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(line), 3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(col), 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST(CursorStreamWrapper, MissingComma) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,8 +74,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t col, line;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool ret = testJson(json, line, col);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(ret);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(line, 3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(col, 12);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(line), 3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(col), 12);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST(CursorStreamWrapper, MissingArrayBracket) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,8 +83,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t col, line;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool ret = testJson(json, line, col);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(ret);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(line, 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(col, 9);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(line), 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(col), 9);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST(CursorStreamWrapper, MissingArrayComma) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -92,8 +92,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t col, line;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool ret = testJson(json, line, col);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(ret);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(line, 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(col, 6);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(line), 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(col), 6);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST(CursorStreamWrapper, MissingLastArrayBracket) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -101,8 +101,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t col, line;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool ret = testJson(json8, line, col);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(ret);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(line, 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(col, 15);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(line), 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(col), 15);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST(CursorStreamWrapper, MissingLastBracket) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,6 +110,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t col, line;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool ret = testJson(json9, line, col);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(ret);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(line, 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(col, 16);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(line), 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(col), 16);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ur test/unittest/istreamwrappertest.cpp.orig test/unittest/istreamwrappertest.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/unittest/istreamwrappertest.cpp.orig 2018-04-24 23:13:00.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/unittest/istreamwrappertest.cpp 2018-05-05 01:36:02.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,22 +35,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- StringStreamType iss;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BasicIStreamWrapper<StringStreamType> is(iss);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(0, is.Tell());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sizeof(Ch) == 1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(0, static_cast<long>(is.Tell()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (static_cast<int>(sizeof(Ch)) == 1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ(0, is.Peek4());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(0, is.Tell());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(0, static_cast<long>(is.Tell()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ(0, is.Peek());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ(0, is.Take());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(0, is.Tell());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(0, static_cast<long>(is.Tell()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Ch s[] = { 'A', 'B', 'C', '\0' };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- StringStreamType iss(s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BasicIStreamWrapper<StringStreamType> is(iss);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(0, is.Tell());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sizeof(Ch) == 1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(0, static_cast<long>(is.Tell()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (static_cast<int>(sizeof(Ch)) == 1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ(0, is.Peek4()); // less than 4 bytes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int i = 0; i < 3; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,7 +59,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ('A' + i, is.Peek());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ('A' + i, is.Take());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(3, is.Tell());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(3, static_cast<long>(is.Tell()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ(0, is.Peek());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ(0, is.Take());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,11 +68,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Ch s[] = { 'A', 'B', 'C', 'D', 'E', '\0' };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- StringStreamType iss(s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BasicIStreamWrapper<StringStreamType> is(iss);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sizeof(Ch) == 1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (static_cast<int>(sizeof(Ch)) == 1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const Ch* c = is.Peek4();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int i = 0; i < 4; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ('A' + i, c[i]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(0, is.Tell());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(0, static_cast<long>(is.Tell()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int i = 0; i < 5; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ(static_cast<size_t>(i), is.Tell());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -80,7 +80,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ('A' + i, is.Peek());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ('A' + i, is.Take());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(5, is.Tell());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(5, static_cast<long>(is.Tell()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ(0, is.Peek());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ(0, is.Take());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -129,7 +129,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Document d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(!d.ParseStream(eis).HasParseError());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(d.IsObject());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(5, d.MemberCount());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(5, static_cast<int>(d.MemberCount()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST(IStreamWrapper, fstream) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -140,7 +140,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Document d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(!d.ParseStream(eis).HasParseError());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(d.IsObject());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(5, d.MemberCount());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(5, static_cast<int>(d.MemberCount()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // wifstream/wfstream only works on C++11 with codecvt_utf16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -158,7 +158,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d.ParseStream<kParseDefaultFlags, UTF16<>, WIStreamWrapper>(isw);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(!d.HasParseError());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(d.IsObject());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(5, d.MemberCount());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(5, static_cast<int>(d.MemberCount()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST(IStreamWrapper, wfstream) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -171,7 +171,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d.ParseStream<kParseDefaultFlags, UTF16<>, WIStreamWrapper>(isw);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(!d.HasParseError());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(d.IsObject());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(5, d.MemberCount());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(5, static_cast<int>(d.MemberCount()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ur test/unittest/pointertest.cpp.orig test/unittest/pointertest.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/unittest/pointertest.cpp.orig 2018-04-24 23:13:00.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/unittest/pointertest.cpp 2018-05-05 01:30:13.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -153,7 +153,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ(kPointerInvalidIndex, p.GetTokens()[0].index);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sizeof(SizeType) == 4) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (static_cast<int>(sizeof(SizeType)) == 4) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Invalid index (overflow)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Pointer p("/4294967296");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(p.IsValid());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -290,7 +290,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ(kPointerInvalidIndex, p.GetTokens()[0].index);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sizeof(SizeType) == 4) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (static_cast<int>(sizeof(SizeType)) == 4) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Invalid index (overflow)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Pointer p("#/4294967296");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(p.IsValid());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -634,13 +634,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(Pointer("/abc").Get(d) == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t unresolvedTokenIndex;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(Pointer("/foo/2").Get(d, &unresolvedTokenIndex) == 0); // Out of boundary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(1, unresolvedTokenIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(1, static_cast<int>(unresolvedTokenIndex));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(Pointer("/foo/a").Get(d, &unresolvedTokenIndex) == 0); // "/foo" is an array, cannot query by "a"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(1, unresolvedTokenIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(1, static_cast<int>(unresolvedTokenIndex));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(Pointer("/foo/0/0").Get(d, &unresolvedTokenIndex) == 0); // "/foo/0" is an string, cannot further query
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(2, unresolvedTokenIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(2, static_cast<int>(unresolvedTokenIndex));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(Pointer("/foo/0/a").Get(d, &unresolvedTokenIndex) == 0); // "/foo/0" is an string, cannot further query
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(2, unresolvedTokenIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(2, static_cast<int>(unresolvedTokenIndex));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST(Pointer, GetWithDefault) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -959,13 +959,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t unresolvedTokenIndex;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(GetValueByPointer(d, "/foo/2", &unresolvedTokenIndex) == 0); // Out of boundary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(1, unresolvedTokenIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(1, static_cast<int>(unresolvedTokenIndex));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(GetValueByPointer(d, "/foo/a", &unresolvedTokenIndex) == 0); // "/foo" is an array, cannot query by "a"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(1, unresolvedTokenIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(1, static_cast<int>(unresolvedTokenIndex));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(GetValueByPointer(d, "/foo/0/0", &unresolvedTokenIndex) == 0); // "/foo/0" is an string, cannot further query
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(2, unresolvedTokenIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(2, static_cast<int>(unresolvedTokenIndex));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(GetValueByPointer(d, "/foo/0/a", &unresolvedTokenIndex) == 0); // "/foo/0" is an string, cannot further query
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(2, unresolvedTokenIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(2, static_cast<int>(unresolvedTokenIndex));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // const version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const Value& v = d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -973,13 +973,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ(&d["foo"][0], GetValueByPointer(v, "/foo/0"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(GetValueByPointer(v, "/foo/2", &unresolvedTokenIndex) == 0); // Out of boundary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(1, unresolvedTokenIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(1, static_cast<int>(unresolvedTokenIndex));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(GetValueByPointer(v, "/foo/a", &unresolvedTokenIndex) == 0); // "/foo" is an array, cannot query by "a"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(1, unresolvedTokenIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(1, static_cast<int>(unresolvedTokenIndex));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(GetValueByPointer(v, "/foo/0/0", &unresolvedTokenIndex) == 0); // "/foo/0" is an string, cannot further query
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(2, unresolvedTokenIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(2, static_cast<int>(unresolvedTokenIndex));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(GetValueByPointer(v, "/foo/0/a", &unresolvedTokenIndex) == 0); // "/foo/0" is an string, cannot further query
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(2, unresolvedTokenIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(2, static_cast<int>(unresolvedTokenIndex));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ur test/unittest/readertest.cpp.orig test/unittest/readertest.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/unittest/readertest.cpp.orig 2018-04-24 23:13:00.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/unittest/readertest.cpp 2018-05-05 01:42:43.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -431,8 +431,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Reader reader; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_FALSE(reader.Parse(s, h)); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ(errorCode, reader.GetParseErrorCode());\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(errorOffset, reader.GetErrorOffset());\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(streamPos, s.Tell());\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(errorOffset, static_cast<long>(reader.GetErrorOffset()));\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(streamPos, static_cast<long>(s.Tell()));\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Number too big to be stored in double.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -617,8 +617,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GenericReader<UTF8<> , UTF8<> > reader;\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reader.Parse<kParseValidateEncodingFlag>(s, h);\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ(errorCode, reader.GetParseErrorCode());\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(errorOffset, reader.GetErrorOffset());\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(streamPos, s.Tell());\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(errorOffset, static_cast<long>(reader.GetErrorOffset()));\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(streamPos, static_cast<long>(s.Tell()));\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ARRAY(...) { __VA_ARGS__ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -775,8 +775,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GenericReader<UTF8<>, UTF8<>, CrtAllocator> reader; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_FALSE(reader.Parse(s, h)); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ(errorCode, reader.GetParseErrorCode());\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(errorOffset, reader.GetErrorOffset());\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(streamPos, s.Tell());\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(errorOffset, static_cast<long>(reader.GetErrorOffset()));\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(streamPos, static_cast<long>(s.Tell()));\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Missing a comma or ']' after an array element.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -943,8 +943,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Reader reader; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_FALSE(reader.Parse(s, h)); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ(errorCode, reader.GetParseErrorCode());\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(errorOffset, reader.GetErrorOffset());\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(streamPos, s.Tell());\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(errorOffset, static_cast<long>(reader.GetErrorOffset()));\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(streamPos, static_cast<long>(s.Tell()));\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST(Reader, ParseDocument_Error) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1117,8 +1117,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reader.Parse<kParseIterativeFlag>(json, handler); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(reader.HasParseError()); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ(errorCode, reader.GetParseErrorCode()); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(offset, reader.GetErrorOffset()); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(streamPos, json.Tell()); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(offset, static_cast<long>(reader.GetErrorOffset())); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(streamPos, static_cast<long>(json.Tell())); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST(Reader, IterativeParsing_ErrorHandling) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1866,8 +1866,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Reader reader; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_FALSE(reader.Parse<kParseNanAndInfFlag>(s, h)); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ(errorCode, reader.GetParseErrorCode());\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(errorOffset, reader.GetErrorOffset());\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(streamPos, s.Tell());\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(errorOffset, static_cast<long>(reader.GetErrorOffset()));\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(streamPos, static_cast<long>(s.Tell()));\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double nan = std::numeric_limits<double>::quiet_NaN();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ur test/unittest/stringbuffertest.cpp.orig test/unittest/stringbuffertest.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/unittest/stringbuffertest.cpp.orig 2018-04-24 23:13:00.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/unittest/stringbuffertest.cpp 2018-05-05 01:44:42.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,11 +41,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST(StringBuffer, PutN_Issue672) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GenericStringBuffer<UTF8<>, MemoryPoolAllocator<> > buffer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(0, buffer.GetSize());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(0, buffer.GetLength());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(0, static_cast<long>(buffer.GetSize()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(0, static_cast<long>(buffer.GetLength()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rapidjson::PutN(buffer, ' ', 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(1, buffer.GetSize());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(1, buffer.GetLength());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(1, static_cast<long>(buffer.GetSize()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(1, static_cast<long>(buffer.GetLength()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST(StringBuffer, Clear) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -81,7 +81,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buffer.Put('E');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buffer.Pop(3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(2u, buffer.GetSize());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(2u, static_cast<long>(buffer.GetSize()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ(2u, buffer.GetLength());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_STREQ("AB", buffer.GetString());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ur test/unittest/valuetest.cpp.orig test/unittest/valuetest.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/unittest/valuetest.cpp.orig 2018-04-24 23:13:00.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/unittest/valuetest.cpp 2018-05-05 02:20:08.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,13 +24,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace rapidjson;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST(Value, Size) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sizeof(SizeType) == 4) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (static_cast<int>(sizeof(SizeType)) == 4) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if RAPIDJSON_48BITPOINTER_OPTIMIZATION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(16, sizeof(Value));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(16, static_cast<long>(sizeof(Value)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif RAPIDJSON_64BIT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(24, sizeof(Value));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(24, static_cast<long>(sizeof(Value)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(16, sizeof(Value));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(16, static_cast<long>(sizeof(Value)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -652,9 +652,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Templated functions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(z.Is<double>());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(56.78, z.Get<double>());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(57.78, z.Set(57.78).Get<double>());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(58.78, z.Set<double>(58.78).Get<double>());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_DOUBLE_EQ(56.78, z.Get<double>());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_DOUBLE_EQ(57.78, z.Set(57.78).Get<double>());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_DOUBLE_EQ(58.78, z.Set<double>(58.78).Get<double>());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST(Value, Float) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -682,16 +682,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Issue 573
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- z.SetInt(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(0.0f, z.GetFloat());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_FLOAT_EQ(0.0f, z.GetFloat());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- z = 56.78f;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_NEAR(56.78f, z.GetFloat(), 0.0f);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Templated functions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(z.Is<float>());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(56.78f, z.Get<float>());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(57.78f, z.Set(57.78f).Get<float>());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(58.78f, z.Set<float>(58.78f).Get<float>());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_FLOAT_EQ(56.78f, z.Get<float>());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_FLOAT_EQ(57.78f, z.Set(57.78f).Get<float>());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_FLOAT_EQ(58.78f, z.Set<float>(58.78f).Get<float>());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST(Value, IsLosslessDouble) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1135,10 +1135,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a.PushBack(1, allocator);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Value::Array a2(a); // copy constructor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(1, a2.Size());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(1, static_cast<int>(a2.Size()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Value::Array a3 = a;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(1, a3.Size());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(1, static_cast<int>(a3.Size()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Value::ConstArray y = static_cast<const Value&>(x).GetArray();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (void)y;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1175,7 +1175,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- y.PushBack(123, allocator);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- x.PushBack(y.GetArray(), allocator); // Implicit constructor to convert Array to GenericValue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(1, x.Size());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(1, static_cast<int>(x.Size()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_EQ(123, x[0][0].GetInt());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(y.IsArray());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(y.Empty());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1424,7 +1424,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (; itr != x.MemberEnd(); ++itr) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t i = static_cast<size_t>((itr - x.MemberBegin())) + 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_STREQ(itr->name.GetString(), keys[i]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(i, itr->value[0].GetInt());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(i), itr->value[0].GetInt());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Erase the last
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1435,7 +1435,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (; itr != x.MemberEnd(); ++itr) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t i = static_cast<size_t>(itr - x.MemberBegin()) + 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_STREQ(itr->name.GetString(), keys[i]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(i, itr->value[0].GetInt());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(i), itr->value[0].GetInt());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Erase the middle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1447,7 +1447,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t i = static_cast<size_t>(itr - x.MemberBegin());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i += (i < 4) ? 1 : 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_STREQ(itr->name.GetString(), keys[i]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(i, itr->value[0].GetInt());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(static_cast<long>(i), itr->value[0].GetInt());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // EraseMember(ConstMemberIterator, ConstMemberIterator)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1516,10 +1516,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- o.AddMember("1", 1, allocator);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Value::Object o2(o); // copy constructor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(1, o2.MemberCount());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(1, static_cast<int>(o2.MemberCount()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Value::Object o3 = o;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPECT_EQ(1, o3.MemberCount());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_EQ(1, static_cast<int>(o3.MemberCount()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Value::ConstObject y = static_cast<const Value&>(x).GetObject();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (void)y;
</span></pre><pre style='margin:0'>
</pre>