move input adapters outside of basic_json

15625ca4 · Théo DELRIEU · a3321421 · 15625ca4 · 15625ca4 · 15625ca4
Unverified Commit 15625ca4 authored Jul 01, 2017 by Théo DELRIEU
Showing with 749 additions and 743 deletions

src/json.hpp src/json.hpp +281 -275

test/src/unit-class_lexer.cpp test/src/unit-class_lexer.cpp +1 -1

test/src/unit-class_parser.cpp test/src/unit-class_parser.cpp +467 -467

No files found.
--- a/src/json.hpp
+++ b/src/json.hpp
--- a/test/src/unit-class_lexer.cpp
+++ b/test/src/unit-class_lexer.cpp
@@ -36,7 +36,7 @@ using nlohmann::json;
 json::lexer::token_type scan_string(const char* s);
 json::lexer::token_type scan_string(const char* s)
 {
-    return json::lexer(json::input_adapter::create(s)).scan();
+    return json::lexer(nlohmann::detail::input_adapter_factory::create(s)).scan();
 }

 TEST_CASE("lexer class")

--- a/test/src/unit-class_parser.cpp
+++ b/test/src/unit-class_parser.cpp