diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2018-06-18 11:38:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-18 11:38:06 -0700 |
| commit | 885be9c9828514595f2f1d24c45aec620b739730 (patch) | |
| tree | 090287264d31e390bfe5475f87965148c38bdeaf /appveyor.yml | |
| parent | b0a8220e92ce7eaccb3042efa123e17b4d0719e9 (diff) | |
| download | protobuf-885be9c9828514595f2f1d24c45aec620b739730.tar.gz protobuf-885be9c9828514595f2f1d24c45aec620b739730.tar.bz2 protobuf-885be9c9828514595f2f1d24c45aec620b739730.zip | |
Work around MSVC issue with std::atomic initialization (#4777)
* Work around MSVC issue with std::atomic initialization
MSVC seems to have a bug where it does not use constant initialization
for std::atomic, which ends up causing crashes during initialization.
This change introduces a workaround by putting the std::atomic inside a
union, which causes the compiler to use constant initialization for it.
* Added an AppVeyor test for static linking with MSVC
Diffstat (limited to 'appveyor.yml')
| -rw-r--r-- | appveyor.yml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/appveyor.yml b/appveyor.yml index 02e0d313..9644e066 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,3 @@ -# Only test one combination: "Visual Studio 12 + Win64 + Debug + DLL". We can -# test more combinations but AppVeyor just takes too long to finish (each -# combination takes ~15mins). platform: - Win64 @@ -14,6 +11,11 @@ environment: BUILD_DLL: ON UNICODE: ON + - language: cpp + image: Visual Studio 2017 + BUILD_DLL: OFF + UNICODE: ON + - language: csharp image: Visual Studio 2017 |