Fixed clang build

test/src/unit-allocator.cpp

@@ -29,11 +29,16 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wkeyword-macro"
+
 #define private public
 #include <nlohmann/json.hpp>
 using nlohmann::json;
 #undef private
 
+#pragma clang diagnostic pop
+
 namespace
 {
 // special test case to check if memory is leaked if constructor throws

test/src/unit-class_const_iterator.cpp

@@ -29,11 +29,16 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wkeyword-macro"
+
 #define private public
 #include <nlohmann/json.hpp>
 using nlohmann::json;
 #undef private
 
+#pragma clang diagnostic pop
+
 TEST_CASE("const_iterator class")
 {
     SECTION("construction")

test/src/unit-class_iterator.cpp

@@ -29,11 +29,16 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wkeyword-macro"
+
 #define private public
 #include <nlohmann/json.hpp>
 using nlohmann::json;
 #undef private
 
+#pragma clang diagnostic pop
+
 TEST_CASE("iterator class")
 {
     SECTION("construction")

test/src/unit-class_lexer.cpp

@@ -29,11 +29,16 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wkeyword-macro"
+
 #define private public
 #include <nlohmann/json.hpp>
 using nlohmann::json;
 #undef private
 
+#pragma clang diagnostic pop
+
 namespace
 {
 // shortcut to scan a string literal

test/src/unit-class_parser.cpp

@@ -29,11 +29,16 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wkeyword-macro"
+
 #define private public
 #include <nlohmann/json.hpp>
 using nlohmann::json;
 #undef private
 
+#pragma clang diagnostic pop
+
 #include <valarray>
 
 namespace

test/src/unit-constructor1.cpp

@@ -30,11 +30,16 @@ SOFTWARE.
 #include "doctest_compatibility.h"
 DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wkeyword-macro"
+
 #define private public
 #include <nlohmann/json.hpp>
 using nlohmann::json;
 #undef private
 
+#pragma clang diagnostic pop
+
 #include <deque>
 #include <forward_list>
 #include <fstream>

test/src/unit-convenience.cpp

@@ -29,11 +29,16 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wkeyword-macro"
+
 #define private public
 #include <nlohmann/json.hpp>
 using nlohmann::json;
 #undef private
 
+#pragma clang diagnostic pop
+
 #include <sstream>
 
 namespace

test/src/unit-conversions.cpp

@@ -29,11 +29,16 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wkeyword-macro"
+
 #define private public
 #include <nlohmann/json.hpp>
 using nlohmann::json;
 #undef private
 
+#pragma clang diagnostic pop
+
 #include <deque>
 #include <forward_list>
 #include <list>

test/src/unit-iterators1.cpp

@@ -29,11 +29,16 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wkeyword-macro"
+
 #define private public
 #include <nlohmann/json.hpp>
 using nlohmann::json;
 #undef private
 
+#pragma clang diagnostic pop
+
 TEST_CASE("iterators 1")
 {
     SECTION("basic behavior")

test/src/unit-json_pointer.cpp

@@ -29,11 +29,16 @@ SOFTWARE.
 
 #include "doctest_compatibility.h"
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wkeyword-macro"
+
 #define private public
 #include <nlohmann/json.hpp>
 using nlohmann::json;
 #undef private
 
+#pragma clang diagnostic pop
+
 TEST_CASE("JSON pointers")
 {
     SECTION("errors")

test/src/unit-noexcept.cpp

@@ -42,12 +42,17 @@ enum test
 struct pod {};
 struct pod_bis {};
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunneeded-internal-declaration"
+
 void to_json(json&, pod) noexcept{}
 void to_json(json&, pod_bis){}
 void from_json(const json&, pod) noexcept{}
 void from_json(const json&, pod_bis){}
 static json j;
 
+#pragma clang diagnostic pop
+
 static_assert(noexcept(json{}), "");
 static_assert(noexcept(nlohmann::to_json(j, 2)), "");
 static_assert(noexcept(nlohmann::to_json(j, 2.5)), "");

test/src/unit-regression.cpp

@@ -33,11 +33,16 @@ DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
 // for some reason including this after the json header leads to linker errors with VS 2017...
 #include <locale>
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wkeyword-macro"
+
 #define private public
 #include <nlohmann/json.hpp>
 using nlohmann::json;
 #undef private
 
+#pragma clang diagnostic pop
+
 #include <fstream>
 #include <sstream>
 #include <list>

test/src/unit-unicode.cpp

@@ -32,11 +32,16 @@ SOFTWARE.
 // for some reason including this after the json header leads to linker errors with VS 2017...
 #include <locale>
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wkeyword-macro"
+
 #define private public
 #include <nlohmann/json.hpp>
 using nlohmann::json;
 #undef private
 
+#pragma clang diagnostic pop
+
 #include <fstream>
 #include <sstream>
 #include <iostream>