3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-26 17:41:09 +08:00
Code Issues Projects Releases Wiki Activity

[mongo-cxx-driver] Patch std::atomic P0883 changes (#11584)

Browse Source 
Previously submitted as https://github.com/mongodb/mongo-cxx-driver/pull/654
This commit is contained in:
Billy O'Neal 2020-05-29 13:03:06 -07:00 committed by GitHub
parent 091e190117
commit a64dc07690
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/mongo-cxx-driver/CONTROL
View File

@ -1,5 +1,5 @@
Source: mongo-cxx-driver
Version: 3.4.0-4
Version: 3.4.0-5
Build-Depends: libbson, mongo-c-driver, boost-smart-ptr, boost-optional, boost-utility
Homepage: https://github.com/mongodb/mongo-cxx-driver
Description: MongoDB C++ Driver.

30
ports/mongo-cxx-driver/github-654.patch Normal file
View File

@ -0,0 +1,30 @@
From e1a92d8bf8f07abc89350a956819b78df05bc4fe Mon Sep 17 00:00:00 2001
From: Billy Robert O'Neal III <bion@microsoft.com>
Date: Mon, 25 May 2020 20:47:58 -0700
Subject: [PATCH] Disable trivially_constructible test for atomic on MSVC++.
MSVC++ implements P0883 unconditionally, which changes the rules for std::atomic. It removes atomic's trivial constructor, and makes the default constructor value initialize the T.
Note that Mongo was not following the C++11 rules, because it used the atomic before calling atomic_init first. MSVC++ never implemented the C++11 rules and previously default initialized the T.
All versions of MSVC++ will provide constant initialization of the guarded value "current_instance". In old versions, atomic didn't implement P0883 due to bugs in the constexpr evaluator; in current versions the constexpr evaluator was fixed and atomic value initializes unconditionally. Therefore, this PR disables the check whenever MSVC++'s standard library is detected.
See https://github.com/microsoft/STL/issues/661 for further discussion.
---
src/mongocxx/instance.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/mongocxx/instance.cpp b/src/mongocxx/instance.cpp
index e67d41ec7..6eb456c65 100644
--- a/src/mongocxx/instance.cpp
+++ b/src/mongocxx/instance.cpp
@@ -75,7 +75,8 @@ typename std::aligned_storage<sizeof(instance), alignof(instance)>::type sentine
std::atomic<instance*> current_instance{nullptr};
static_assert(std::is_standard_layout<decltype(current_instance)>::value,
"Must be standard layout");
-#if (!defined(__GNUC__) || (defined(__clang__) && !defined(__GLIBCXX__))) || (__GNUC__ >= 5)
+#if (!defined(_MSVC_STL_VERSION)) \
+ && ((!defined(__GNUC__) || (defined(__clang__) && !defined(__GLIBCXX__))) || (__GNUC__ >= 5))
static_assert(std::is_trivially_constructible<decltype(current_instance)>::value,
"Must be trivially constructible");
#endif

1
ports/mongo-cxx-driver/portfile.cmake
View File

@ -15,6 +15,7 @@ vcpkg_from_github(
disable_test_and_example.patch
fix-dependency-libbson.patch
fix-dependency-mongocdriver.patch
github-654.patch
)
if ("mnmlstc" IN_LIST FEATURES)