diff options
| author | Morwenn | 2022-06-07 18:46:46 +0200 |
|---|---|---|
| committer | GitHub | 2022-06-07 18:46:46 +0200 |
| commit | a0ece7b2528418c730c4feb2871808f739afd482 (patch) | |
| tree | 81a49008d54cd25ac4a7505050a6f7271994669c /src/catch2/internal | |
| parent | d0177ee68607e7298869807bfcd20c080512185f (diff) | |
| download | catch3-a0ece7b2528418c730c4feb2871808f739afd482.tar.gz | |
Compatility fixes for GCC5 (#2448)
* GCC5 compat: work around inherited constructor issues
Don't use inherited constructors, forward manually instead. This
basically reverts 61f803126d3cff2195d700d11d07c6578f416b23.
I believe that GCC5 does not implement P0136, a C++17 change that made
inherited constructors actually usable and was backported as a DR all
the way to C++11.
* GCC5 compat: bypass std::pair construction issue
Co-authored-by: Martin Hořeňovský <martin.horenovsky@gmail.com>
Diffstat (limited to 'src/catch2/internal')
| -rw-r--r-- | src/catch2/internal/catch_reporter_spec_parser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/catch2/internal/catch_reporter_spec_parser.cpp b/src/catch2/internal/catch_reporter_spec_parser.cpp index 28b2088a..30ee191c 100644 --- a/src/catch2/internal/catch_reporter_spec_parser.cpp +++ b/src/catch2/internal/catch_reporter_spec_parser.cpp @@ -126,7 +126,7 @@ namespace Catch { return {}; } - auto ret = kvPairs.emplace( kv.key, kv.value ); + auto ret = kvPairs.emplace( std::string(kv.key), std::string(kv.value) ); if ( !ret.second ) { // Duplicated key. We might want to handle this differently, // e.g. by overwriting the existing value? |