Merge branch 'develop' into bench/json-view-comparison-fairness

Signed-off-by: Niels Lohmann <mail@nlohmann.me>

tests/benchmarks/src/benchmarks.cpp

@@ -21,7 +21,7 @@
 #include <vector>
 #include <test_data.hpp>
 
-using json = nlohmann::json;
+using nlohmann::json;
 
 //////////////////////////////////////////////////////////////////////////////
 // parse JSON from file

tests/benchmarks/src/benchmarks_view.cpp

@@ -17,8 +17,8 @@
 #include <string>
 #include <test_data.hpp>
 
-using json = nlohmann::json;
-using json_document = nlohmann::json_document;
+using nlohmann::json;
+using nlohmann::json_document;
 
 static std::string read_file(const char* filename)
 {