From 91d51e6543ccb0332c29a645f65767ddc9627f8f Mon Sep 17 00:00:00 2001
From: Denis Blank <denis.blank@outlook.com>
Date: Mon, 2 Sep 2019 00:37:37 +0200
Subject: [PATCH] Attempt to fix the clang/GCC build

---
 .../single/test-continuable-result.cpp          |  8 ++++++++
 test/unit-test/test-continuable.hpp             | 17 +++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/test/unit-test/single/test-continuable-result.cpp b/test/unit-test/single/test-continuable-result.cpp
index 586c64e..121c32a 100644
--- a/test/unit-test/single/test-continuable-result.cpp
+++ b/test/unit-test/single/test-continuable-result.cpp
@@ -62,7 +62,15 @@ using unique_type = result<std::unique_ptr<int>>;
 
 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);
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
 TYPED_TEST(result_all_tests, is_default_constructible) {
   TypeParam e;
diff --git a/test/unit-test/test-continuable.hpp b/test/unit-test/test-continuable.hpp
index a4c5ca3..c04f1ed 100644
--- a/test/unit-test/test-continuable.hpp
+++ b/test/unit-test/test-continuable.hpp
@@ -208,7 +208,15 @@ struct tag3 {};
 template <typename 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);
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
 template <typename T, typename First, typename Second>
 struct combine_to_type;
@@ -249,7 +257,16 @@ template <typename Provider, typename Connector>
 struct single_aggregate_tests<identity<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);
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
 template <typename T>
 auto make_step(T* me, unsigned& current, unsigned step) {