coffee/continuable
1
0
Fork 0
mirror of https://github.com/Naios/continuable.git synced 2025-12-07 01:06:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix the clang/GCC build

Browse Source
This commit is contained in:
Denis Blank 2019-09-02 00:37:37 +02:00
parent 5e8bbe7c72
commit 91d51e6543
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/unit-test/single/test-continuable-result.cpp
View File

@ -62,7 +62,15 @@ using unique_type = result<std::unique_ptr<int>>;
using result_test_types = testing::Types<unique_type, copyable_type>; using result_test_types = testing::Types<unique_type, copyable_type>;
// https://github.com/google/googletest/issues/2271
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
#endif
TYPED_TEST_SUITE(result_all_tests, result_test_types); TYPED_TEST_SUITE(result_all_tests, result_test_types);
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
TYPED_TEST(result_all_tests, is_default_constructible) { TYPED_TEST(result_all_tests, is_default_constructible) {
TypeParam e; TypeParam e;

17
test/unit-test/test-continuable.hpp
View File

@ -208,7 +208,15 @@ struct tag3 {};
template <typename Provider> template <typename Provider>
struct single_dimension_tests : continuation_provider<Provider> {}; struct single_dimension_tests : continuation_provider<Provider> {};
// https://github.com/google/googletest/issues/2271
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
#endif
TYPED_TEST_SUITE(single_dimension_tests, single_types); TYPED_TEST_SUITE(single_dimension_tests, single_types);
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
template <typename T, typename First, typename Second> template <typename T, typename First, typename Second>
struct combine_to_type; struct combine_to_type;
@ -249,7 +257,16 @@ template <typename Provider, typename Connector>
struct single_aggregate_tests<identity<Provider, Connector>> struct single_aggregate_tests<identity<Provider, Connector>>
: continuation_provider<Provider>, Connector {}; : continuation_provider<Provider>, Connector {};
// https://github.com/google/googletest/issues/2271
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
#endif
TYPED_TEST_SUITE(single_aggregate_tests, aggregate_types); TYPED_TEST_SUITE(single_aggregate_tests, aggregate_types);
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
template <typename T> template <typename T>
auto make_step(T* me, unsigned& current, unsigned step) { auto make_step(T* me, unsigned& current, unsigned step) {