mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-29 22:28:08 -07:00
dev-cpp/nlohmann_json: drop 3.6.1-r1, 3.7.0, 3.7.3
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
@@ -1,5 +1,2 @@
|
||||
DIST nlohmann_json-3.6.1.tar.gz 118862808 BLAKE2B 257508b33480741bd4438fe928869c0744a5e84806fa4e068b048bfc0e665802a45f31bc740c14f74e7a0384df18b9bba58a0e001750b1a800ea00cd1712b280 SHA512 e0565ccdee34e89a6836a97f039c04a0bac445b44f6f323918ea424b34e4577688a4f4f72d5ef1ec0b53d159bfe87e8e9c97b70ef98231ea463f59f05e16eb2a
|
||||
DIST nlohmann_json-3.7.0.tar.gz 118868542 BLAKE2B 25191628b737ea5614de85d0fcb4425fcb2d37e6890626e6ba22949430a1c5f827ff17d1cd8245c8e98d0deda617d8268c55caff3017a6b4a2f730e524599311 SHA512 35510a0ee59d847ff9fcd4f4026ef936abb89675884fdd2db808f8349a55073206f764cd4f797deb1b6493ea0e04889505f49483e5b88798011dd5db87e7c87d
|
||||
DIST nlohmann_json-3.7.3.tar.gz 119013476 BLAKE2B c10648cacdaf6f82aa2b1db49a412165eb9f3d00fd2b2232531077209c2add27dfebfb9dcd62e6923769411a471778a18a347b524e2ed3cf6f008883333ab8cd SHA512 c416b1e14f1fd695fc30a56127ca6440de4b334858ced54a6424d9d093e4665e74b7048f9ab7253ac02ac870e64a2868c78e6c2d6de80d1bd49e50a850cec865
|
||||
DIST nlohmann_json-3.9.1-testdata.tar.gz 112348454 BLAKE2B f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d SHA512 d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
|
||||
DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B 97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090 SHA512 e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642
|
||||
|
||||
@@ -1,131 +0,0 @@
|
||||
From ec955f08b47ab7cb81f6e4a4c3e7b331ddf50f71 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Art=C3=B6m=20Bakri=20Al-Sarmini?= <3sz3tt+git@gmail.com>
|
||||
Date: Sun, 12 Apr 2020 22:32:39 +0300
|
||||
Subject: [PATCH 1/2] Templatize basic_json ctor from json_ref
|
||||
|
||||
---
|
||||
include/nlohmann/detail/meta/type_traits.hpp | 13 ++++++++++++
|
||||
include/nlohmann/json.hpp | 8 ++++----
|
||||
single_include/nlohmann/json.hpp | 21 ++++++++++++++++----
|
||||
3 files changed, 34 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp
|
||||
index 280f69534..dd0b3084f 100644
|
||||
--- a/include/nlohmann/detail/meta/type_traits.hpp
|
||||
+++ b/include/nlohmann/detail/meta/type_traits.hpp
|
||||
@@ -41,6 +41,19 @@ template<typename> struct is_basic_json : std::false_type {};
|
||||
NLOHMANN_BASIC_JSON_TPL_DECLARATION
|
||||
struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
|
||||
|
||||
+//////////////////////
|
||||
+// jspn_ref helpers //
|
||||
+//////////////////////
|
||||
+
|
||||
+template <typename>
|
||||
+class json_ref;
|
||||
+
|
||||
+template<typename>
|
||||
+struct is_json_ref : std::false_type {};
|
||||
+
|
||||
+template <typename T>
|
||||
+struct is_json_ref<json_ref<T>> : std::true_type {};
|
||||
+
|
||||
//////////////////////////
|
||||
// aliases for detected //
|
||||
//////////////////////////
|
||||
diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp
|
||||
index 336d69fe7..0598efc8c 100644
|
||||
--- a/include/nlohmann/json.hpp
|
||||
+++ b/include/nlohmann/json.hpp
|
||||
@@ -1773,10 +1773,10 @@ class basic_json
|
||||
// other constructors and destructor //
|
||||
///////////////////////////////////////
|
||||
|
||||
- /// @private
|
||||
- basic_json(const detail::json_ref<basic_json>& ref)
|
||||
- : basic_json(ref.moved_or_copied())
|
||||
- {}
|
||||
+ template <typename JsonRef,
|
||||
+ detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>,
|
||||
+ std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 >
|
||||
+ basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
|
||||
|
||||
/*!
|
||||
@brief copy constructor
|
||||
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
|
||||
index 09464f3b2..8927180e6 100644
|
||||
--- a/single_include/nlohmann/json.hpp
|
||||
+++ b/single_include/nlohmann/json.hpp
|
||||
@@ -2794,6 +2794,19 @@ template<typename> struct is_basic_json : std::false_type {};
|
||||
NLOHMANN_BASIC_JSON_TPL_DECLARATION
|
||||
struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
|
||||
|
||||
+//////////////////////
|
||||
+// jspn_ref helpers //
|
||||
+//////////////////////
|
||||
+
|
||||
+template <typename>
|
||||
+class json_ref;
|
||||
+
|
||||
+template<typename>
|
||||
+struct is_json_ref : std::false_type {};
|
||||
+
|
||||
+template <typename T>
|
||||
+struct is_json_ref<json_ref<T>> : std::true_type {};
|
||||
+
|
||||
//////////////////////////
|
||||
// aliases for detected //
|
||||
//////////////////////////
|
||||
@@ -16632,10 +16645,10 @@ class basic_json
|
||||
// other constructors and destructor //
|
||||
///////////////////////////////////////
|
||||
|
||||
- /// @private
|
||||
- basic_json(const detail::json_ref<basic_json>& ref)
|
||||
- : basic_json(ref.moved_or_copied())
|
||||
- {}
|
||||
+ template <typename JsonRef,
|
||||
+ detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>,
|
||||
+ std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 >
|
||||
+ basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
|
||||
|
||||
/*!
|
||||
@brief copy constructor
|
||||
|
||||
From 70be9751cd60e622ce6463f41d47c02fc2d83cbc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Art=C3=B6m=20Bakri=20Al-Sarmini?= <3sz3tt+git@gmail.com>
|
||||
Date: Sun, 12 Apr 2020 23:42:26 +0300
|
||||
Subject: [PATCH 2/2] typo fix
|
||||
|
||||
---
|
||||
include/nlohmann/detail/meta/type_traits.hpp | 2 +-
|
||||
single_include/nlohmann/json.hpp | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp
|
||||
index dd0b3084f..13e92cb48 100644
|
||||
--- a/include/nlohmann/detail/meta/type_traits.hpp
|
||||
+++ b/include/nlohmann/detail/meta/type_traits.hpp
|
||||
@@ -42,7 +42,7 @@ NLOHMANN_BASIC_JSON_TPL_DECLARATION
|
||||
struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
|
||||
|
||||
//////////////////////
|
||||
-// jspn_ref helpers //
|
||||
+// json_ref helpers //
|
||||
//////////////////////
|
||||
|
||||
template <typename>
|
||||
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
|
||||
index 8927180e6..294e7509b 100644
|
||||
--- a/single_include/nlohmann/json.hpp
|
||||
+++ b/single_include/nlohmann/json.hpp
|
||||
@@ -2795,7 +2795,7 @@ NLOHMANN_BASIC_JSON_TPL_DECLARATION
|
||||
struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
|
||||
|
||||
//////////////////////
|
||||
-// jspn_ref helpers //
|
||||
+// json_ref helpers //
|
||||
//////////////////////
|
||||
|
||||
template <typename>
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake
|
||||
|
||||
DESCRIPTION="JSON for Modern C++"
|
||||
HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
|
||||
SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc ppc64 x86"
|
||||
IUSE="doc test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="doc? ( app-doc/doxygen )"
|
||||
|
||||
DOCS=( ChangeLog.md README.md )
|
||||
|
||||
S=${WORKDIR}/json-${PV}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DJSON_BuildTests=$(usex test)
|
||||
-DJSON_MultipleHeaders=ON
|
||||
)
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake_src_compile
|
||||
use doc && emake -C doc
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
use doc && dodoc -r doc/html
|
||||
}
|
||||
@@ -1,45 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake
|
||||
|
||||
DESCRIPTION="JSON for Modern C++"
|
||||
HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
|
||||
SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
|
||||
IUSE="doc test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="doc? ( app-doc/doxygen )"
|
||||
|
||||
DOCS=( ChangeLog.md README.md )
|
||||
|
||||
S=${WORKDIR}/json-${PV}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DJSON_BuildTests=$(usex test)
|
||||
-DJSON_MultipleHeaders=ON
|
||||
)
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake_src_compile
|
||||
use doc && emake -C doc
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
use doc && dodoc -r doc/html
|
||||
}
|
||||
@@ -1,49 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake
|
||||
|
||||
DESCRIPTION="JSON for Modern C++"
|
||||
HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
|
||||
SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
|
||||
IUSE="doc test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="doc? ( app-doc/doxygen )"
|
||||
|
||||
DOCS=( ChangeLog.md README.md )
|
||||
|
||||
S=${WORKDIR}/json-${PV}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-3.7.3-gcc-10.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DJSON_BuildTests=$(usex test)
|
||||
-DJSON_MultipleHeaders=ON
|
||||
)
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake_src_compile
|
||||
use doc && emake -C doc
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
use doc && dodoc -r doc/html
|
||||
}
|
||||
Reference in New Issue
Block a user