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

Compatility fixes for GCC5 (#2448)

Browse Source 
* GCC5 compat: work around inherited constructor issues

Don't use inherited constructors, forward manually instead. This
basically reverts 61f803126d.

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>
This commit is contained in:
Morwenn 2022-06-07 18:46:46 +02:00 committed by GitHub
parent d0177ee686
commit a0ece7b252
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/catch2/internal/catch_reporter_spec_parser.cpp
View File

@ -126,7 +126,7 @@ namespace Catch {
return {}; return {};
} }
auto ret = kvPairs.emplace( kv.key, kv.value ); auto ret = kvPairs.emplace( std::string(kv.key), std::string(kv.value) );
if ( !ret.second ) { if ( !ret.second ) {
// Duplicated key. We might want to handle this differently, // Duplicated key. We might want to handle this differently,
// e.g. by overwriting the existing value? // e.g. by overwriting the existing value?

8
src/catch2/reporters/catch_reporter_automake.hpp
View File

@ -8,7 +8,9 @@
#ifndef CATCH_REPORTER_AUTOMAKE_HPP_INCLUDED #ifndef CATCH_REPORTER_AUTOMAKE_HPP_INCLUDED
#define CATCH_REPORTER_AUTOMAKE_HPP_INCLUDED #define CATCH_REPORTER_AUTOMAKE_HPP_INCLUDED
#include <catch2/interfaces/catch_interfaces_reporter.hpp>
#include <catch2/reporters/catch_reporter_streaming_base.hpp> #include <catch2/reporters/catch_reporter_streaming_base.hpp>
#include <catch2/internal/catch_move_and_forward.hpp>
#include <string> #include <string>
@ -16,7 +18,11 @@ namespace Catch {
class AutomakeReporter final : public StreamingReporterBase { class AutomakeReporter final : public StreamingReporterBase {
public: public:
using StreamingReporterBase::StreamingReporterBase; // GCC5 compat: we cannot use inherited constructor, because it
// doesn't implement backport of P0136
AutomakeReporter(ReporterConfig&& _config):
StreamingReporterBase(CATCH_MOVE(_config))
{}
~AutomakeReporter() override; ~AutomakeReporter() override;
static std::string getDescription() { static std::string getDescription() {

8
src/catch2/reporters/catch_reporter_cumulative_base.hpp
View File

@ -8,7 +8,9 @@
#ifndef CATCH_REPORTER_CUMULATIVE_BASE_HPP_INCLUDED #ifndef CATCH_REPORTER_CUMULATIVE_BASE_HPP_INCLUDED
#define CATCH_REPORTER_CUMULATIVE_BASE_HPP_INCLUDED #define CATCH_REPORTER_CUMULATIVE_BASE_HPP_INCLUDED
#include <catch2/interfaces/catch_interfaces_reporter.hpp>
#include <catch2/reporters/catch_reporter_common_base.hpp> #include <catch2/reporters/catch_reporter_common_base.hpp>
#include <catch2/internal/catch_move_and_forward.hpp>
#include <catch2/internal/catch_unique_ptr.hpp> #include <catch2/internal/catch_unique_ptr.hpp>
#include <catch2/internal/catch_optional.hpp> #include <catch2/internal/catch_optional.hpp>
@ -88,7 +90,11 @@ namespace Catch {
using TestCaseNode = Node<TestCaseStats, SectionNode>; using TestCaseNode = Node<TestCaseStats, SectionNode>;
using TestRunNode = Node<TestRunStats, TestCaseNode>; using TestRunNode = Node<TestRunStats, TestCaseNode>;
using ReporterBase::ReporterBase; // GCC5 compat: we cannot use inherited constructor, because it
// doesn't implement backport of P0136
CumulativeReporterBase(ReporterConfig&& _config):
ReporterBase(CATCH_MOVE(_config))
{}
~CumulativeReporterBase() override; ~CumulativeReporterBase() override;
void benchmarkPreparing( StringRef ) override {} void benchmarkPreparing( StringRef ) override {}

8
src/catch2/reporters/catch_reporter_streaming_base.hpp
View File

@ -8,7 +8,9 @@
#ifndef CATCH_REPORTER_STREAMING_BASE_HPP_INCLUDED #ifndef CATCH_REPORTER_STREAMING_BASE_HPP_INCLUDED
#define CATCH_REPORTER_STREAMING_BASE_HPP_INCLUDED #define CATCH_REPORTER_STREAMING_BASE_HPP_INCLUDED
#include <catch2/interfaces/catch_interfaces_reporter.hpp>
#include <catch2/reporters/catch_reporter_common_base.hpp> #include <catch2/reporters/catch_reporter_common_base.hpp>
#include <catch2/internal/catch_move_and_forward.hpp>
#include <vector> #include <vector>
@ -16,7 +18,11 @@ namespace Catch {
class StreamingReporterBase : public ReporterBase { class StreamingReporterBase : public ReporterBase {
public: public:
using ReporterBase::ReporterBase; // GCC5 compat: we cannot use inherited constructor, because it
// doesn't implement backport of P0136
StreamingReporterBase(ReporterConfig&& _config):
ReporterBase(CATCH_MOVE(_config))
{}
~StreamingReporterBase() override; ~StreamingReporterBase() override;
void benchmarkPreparing( StringRef ) override {} void benchmarkPreparing( StringRef ) override {}