<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/abf47a9380cc6545f0a7b9806f8788f3b962f797">https://github.com/macports/macports-ports/commit/abf47a9380cc6545f0a7b9806f8788f3b962f797</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new abf47a9 jsoncpp-devel: update to 20190925-227c7cdf
</span>abf47a9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit abf47a9380cc6545f0a7b9806f8788f3b962f797
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Sep 30 16:38:47 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> jsoncpp-devel: update to 20190925-227c7cdf
</span>---
devel/jsoncpp/Portfile | 10 +++----
devel/jsoncpp/files/patch-fix-build.diff | 46 +++++++++++++++++++-------------
2 files changed, 33 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jsoncpp/Portfile b/devel/jsoncpp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 73a14e4..ee7972d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/jsoncpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/jsoncpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,11 +32,11 @@ if {${subport} eq ${name}} {
</span>
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup open-source-parsers jsoncpp fd940255ced7773489f818e62d7074fbcfda81cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190826-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 d359292b9b13f824265e82922127772034bd1d84 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8060e04b5048466b43e9f93f7f6d1c3b967ce16bc6f87a04d72d527a80307644 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 202850
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup open-source-parsers jsoncpp 227c7cdfa55c977cdee02ddba09c80dff8130595
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190925-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 3bd606ab7bdb71c4c1cd85d3c325f15667825fd2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7140f87372c8ce38a6e59d83cb19f680bc8b5236744fe6a77e9c67d68163fb48 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 206036
</span> revision 0
conflicts jsoncpp
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jsoncpp/files/patch-fix-build.diff b/devel/jsoncpp/files/patch-fix-build.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3500da5..eedc0cd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/jsoncpp/files/patch-fix-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/jsoncpp/files/patch-fix-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,65 +1,75 @@
</span> diff --git a/include/json/reader.h b/include/json/reader.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 947fc00..1a7368e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fb2365a..bd7b075 100644
</span> --- a/include/json/reader.h
+++ b/include/json/reader.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,7 +36,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,8 +36,9 @@ namespace Json {
</span> *
* \deprecated Use CharReader and CharReaderBuilder.
*/
<span style='display:block; white-space:pre;background:#ffe0e0;'>--class [[deprecated("deprecated Use CharReader and CharReaderBuilder.")]] JSON_API Reader {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+class JSON_API [[deprecated("deprecated Use CharReader and CharReaderBuilder.")]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-class [[deprecated(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "deprecated Use CharReader and CharReaderBuilder.")]] JSON_API Reader {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class JSON_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [[deprecated("deprecated Use CharReader and CharReaderBuilder.")]]
</span> + Reader {
public:
typedef char Char;
typedef const Char* Location;
diff --git a/include/json/writer.h b/include/json/writer.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3280141..4dd0f9a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9799a3b..8ad325f 100644
</span> --- a/include/json/writer.h
+++ b/include/json/writer.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -145,7 +145,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -145,7 +145,9 @@ public:
</span> /** \brief Abstract class for writers.
* \deprecated Use StreamWriter. (And really, this is an implementation detail.)
*/
-class [[deprecated("Use StreamWriter instead")]] JSON_API Writer {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+class JSON_API [[deprecated("Use StreamWriter instead")]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class JSON_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [[deprecated("Use StreamWriter instead")]]
</span> + Writer {
public:
virtual ~Writer();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -165,8 +166,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -165,8 +167,9 @@ public:
</span> #pragma warning(push)
#pragma warning(disable : 4996) // Deriving from deprecated class
#endif
-class [[deprecated("Use StreamWriterBuilder instead")]] JSON_API FastWriter
- : public Writer {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+class JSON_API [[deprecated("Use StreamWriterBuilder instead")]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class JSON_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [[deprecated("Use StreamWriterBuilder instead")]]
</span> + FastWriter : public Writer {
public:
FastWriter();
~FastWriter() override = default;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -225,7 +226,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -225,8 +228,9 @@ private:
</span> #pragma warning(push)
#pragma warning(disable : 4996) // Deriving from deprecated class
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>--class [[deprecated("Use StreamWriterBuilder instead")]] JSON_API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+class JSON_API [[deprecated("Use StreamWriterBuilder instead")]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- StyledWriter : public Writer {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-class [[deprecated("Use StreamWriterBuilder instead")]] JSON_API StyledWriter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- : public Writer {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class JSON_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [[deprecated("Use StreamWriterBuilder instead")]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ StyledWriter : public Writer {
</span> public:
StyledWriter();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -294,7 +295,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ~StyledWriter() override = default;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -294,8 +298,9 @@ private:
</span> #pragma warning(push)
#pragma warning(disable : 4996) // Deriving from deprecated class
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>--class [[deprecated("Use StreamWriterBuilder instead")]] JSON_API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+class JSON_API [[deprecated("Use StreamWriterBuilder instead")]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- StyledStreamWriter {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-class [[deprecated(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "Use StreamWriterBuilder instead")]] JSON_API StyledStreamWriter {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class JSON_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [[deprecated("Use StreamWriterBuilder instead")]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ StyledStreamWriter {
</span> public:
/**
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ * \param indentation Each level will be indented by this amount extra.
</span> diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp
index d2d41aa..2155d29 100644
--- a/src/jsontestrunner/main.cpp
+++ b/src/jsontestrunner/main.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,9 +56,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,9 +56,11 @@ static Json::String readInputTestFile(const char* path) {
</span> return "";
fseek(file, 0, SEEK_END);
long const size = ftell(file);
</pre><pre style='margin:0'>
</pre>