reamalgamate

f1969e60 · Francois Chabot · 5684d9a4 · f1969e60 · f1969e60 · f1969e60
Commit f1969e60 authored May 27, 2020 by Francois Chabot
Expand all Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 4 deletions

json.hpp include/nlohmann/json.hpp +0 -0

json.hpp single_include/nlohmann/json.hpp +0 -0

unit-user_defined_input.cpp test/src/unit-user_defined_input.cpp +10 -4

No files found.
--- a/include/nlohmann/json.hpp
+++ b/include/nlohmann/json.hpp
--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
--- a/test/src/unit-user_defined_input.cpp
+++ b/test/src/unit-user_defined_input.cpp
@@ -79,7 +79,8 @@ TEST_CASE("Custom iterator")
 {
    const char* raw_data = "[1,2,3,4]";
-    struct MyIterator {
+    struct MyIterator
+    {
        using difference_type = std::size_t;
        using value_type = char;
        using pointer = const char*;
@@ -87,13 +88,18 @@ TEST_CASE("Custom iterator")
        using iterator_category = std::input_iterator_tag;
-        MyIterator& operator++() { 
+        MyIterator& operator++()
+        {
            ++ptr;
            return *this;
        }
-        reference operator*() const {return *ptr;}
+        reference operator*() const
-        bool operator!=(const MyIterator& rhs) const {
+        {
+            return *ptr;
+        }
+        bool operator!=(const MyIterator& rhs) const
+        {
            return ptr != rhs.ptr;
        }