From 65b70e69402c0c86bdf20444f8164e69d728029b Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Mon, 8 Feb 2021 17:45:19 -0800 Subject: [PATCH] [boost-concept-check] Fix warning C4834 when install pagmo2 (#15887) * [boost-concept-check] Fix warning C4834 when install pagmo2 * Update json files * Modify patch * update version * Modify the patch with other workaround * Update git-tree Co-authored-by: Cheney-Wang --- ports/boost-concept-check/fix-warning-c4834.patch | 13 +++++++++++++ ports/boost-concept-check/portfile.cmake | 2 ++ ports/boost-concept-check/vcpkg.json | 1 + versions/b-/boost-concept-check.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ports/boost-concept-check/fix-warning-c4834.patch diff --git a/ports/boost-concept-check/fix-warning-c4834.patch b/ports/boost-concept-check/fix-warning-c4834.patch new file mode 100644 index 0000000000..1932163912 --- /dev/null +++ b/ports/boost-concept-check/fix-warning-c4834.patch @@ -0,0 +1,13 @@ +diff --git a/include/boost/concept_check.hpp b/include/boost/concept_check.hpp +index abbadb7..cab58e5 100644 +--- a/include/boost/concept_check.hpp ++++ b/include/boost/concept_check.hpp +@@ -352,7 +352,7 @@ namespace boost + private: + void test(boost::false_type) + { +- f(first,second); ++ (void) f(first,second); + Return r = f(first, second); // require operator() + (void)r; + } diff --git a/ports/boost-concept-check/portfile.cmake b/ports/boost-concept-check/portfile.cmake index 6f87cfe2de..a643ad9d37 100644 --- a/ports/boost-concept-check/portfile.cmake +++ b/ports/boost-concept-check/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF boost-1.75.0 SHA512 823e3af47881c98f864c70686a3a2f6c9b7d5e6bf0ae61f2983f6c2ba26a70aaa888b683a74ef504ec7f5f479609731e35fad3518f1731954e01e7d67636e5d4 HEAD_REF master + PATCHES + fix-warning-c4834.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-concept-check/vcpkg.json b/ports/boost-concept-check/vcpkg.json index 3b2efd636f..5576019b89 100644 --- a/ports/boost-concept-check/vcpkg.json +++ b/ports/boost-concept-check/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-concept-check", "version-string": "1.75.0", + "port-version": 1, "description": "Boost concept_check module", "homepage": "https://github.com/boostorg/concept_check", "dependencies": [ diff --git a/versions/b-/boost-concept-check.json b/versions/b-/boost-concept-check.json index 8c0f92908b..7aa790b958 100644 --- a/versions/b-/boost-concept-check.json +++ b/versions/b-/boost-concept-check.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee8e9890d2909b5afc0ade5315cb3d4f49164539", + "version-string": "1.75.0", + "port-version": 1 + }, { "git-tree": "d3dcbf8caf23130b9b3bdbe0f896d4db4b87e362", "version-string": "1.75.0", diff --git a/versions/baseline.json b/versions/baseline.json index 18f7972074..f5d9102b0b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -478,7 +478,7 @@ }, "boost-concept-check": { "baseline": "1.75.0", - "port-version": 0 + "port-version": 1 }, "boost-config": { "baseline": "1.75.0",