3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 21:36:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify workaround for MSVC issue with XmlWriter

Browse Source
This commit is contained in:
Martin Hořeňovský 2021-02-21 11:19:02 +01:00
parent 3afea8128a
commit 653764d53b
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/catch2/internal/catch_xmlwriter.cpp
View File

@ -5,9 +5,11 @@
// https://www.boost.org/LICENSE_1_0.txt) // https://www.boost.org/LICENSE_1_0.txt)
// SPDX-License-Identifier: BSL-1.0 // SPDX-License-Identifier: BSL-1.0
#include <catch2/internal/catch_xmlwriter.hpp> // Note: swapping these two includes around causes MSVC to error out
// while in /permissive- mode. No, I don't know why.
// Tested on VS 2019, 18.{3, 4}.x
#include <catch2/internal/catch_enforce.hpp> #include <catch2/internal/catch_enforce.hpp>
#include <catch2/internal/catch_xmlwriter.hpp>
#include <iomanip> #include <iomanip>
#include <type_traits> #include <type_traits>

7
src/catch2/internal/catch_xmlwriter.hpp
View File

@ -10,13 +10,6 @@
#include <catch2/internal/catch_stream.hpp> #include <catch2/internal/catch_stream.hpp>
// FixMe: Without this include (and something inside it), MSVC goes crazy
// and reports that calls to XmlEncode's op << are ambiguous between
// the declaration and definition.
// It also has to be in the header.
#include <catch2/internal/catch_source_line_info.hpp>
#include <vector> #include <vector>
namespace Catch { namespace Catch {