mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
[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 <v-xincwa@microsoft.com>
This commit is contained in:
parent
60d979c588
commit
65b70e6940
13
ports/boost-concept-check/fix-warning-c4834.patch
Normal file
13
ports/boost-concept-check/fix-warning-c4834.patch
Normal file
@ -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;
|
||||||
|
}
|
@ -6,6 +6,8 @@ vcpkg_from_github(
|
|||||||
REF boost-1.75.0
|
REF boost-1.75.0
|
||||||
SHA512 823e3af47881c98f864c70686a3a2f6c9b7d5e6bf0ae61f2983f6c2ba26a70aaa888b683a74ef504ec7f5f479609731e35fad3518f1731954e01e7d67636e5d4
|
SHA512 823e3af47881c98f864c70686a3a2f6c9b7d5e6bf0ae61f2983f6c2ba26a70aaa888b683a74ef504ec7f5f479609731e35fad3518f1731954e01e7d67636e5d4
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
|
PATCHES
|
||||||
|
fix-warning-c4834.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
|
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "boost-concept-check",
|
"name": "boost-concept-check",
|
||||||
"version-string": "1.75.0",
|
"version-string": "1.75.0",
|
||||||
|
"port-version": 1,
|
||||||
"description": "Boost concept_check module",
|
"description": "Boost concept_check module",
|
||||||
"homepage": "https://github.com/boostorg/concept_check",
|
"homepage": "https://github.com/boostorg/concept_check",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "ee8e9890d2909b5afc0ade5315cb3d4f49164539",
|
||||||
|
"version-string": "1.75.0",
|
||||||
|
"port-version": 1
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "d3dcbf8caf23130b9b3bdbe0f896d4db4b87e362",
|
"git-tree": "d3dcbf8caf23130b9b3bdbe0f896d4db4b87e362",
|
||||||
"version-string": "1.75.0",
|
"version-string": "1.75.0",
|
||||||
|
@ -478,7 +478,7 @@
|
|||||||
},
|
},
|
||||||
"boost-concept-check": {
|
"boost-concept-check": {
|
||||||
"baseline": "1.75.0",
|
"baseline": "1.75.0",
|
||||||
"port-version": 0
|
"port-version": 1
|
||||||
},
|
},
|
||||||
"boost-config": {
|
"boost-config": {
|
||||||
"baseline": "1.75.0",
|
"baseline": "1.75.0",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user