Skip to content

Commit

Permalink
🔨 moved class json_pointer into separate file #920
Browse files Browse the repository at this point in the history
  • Loading branch information
nlohmann committed Jan 28, 2018
1 parent e95578f commit 1483d39
Show file tree
Hide file tree
Showing 7 changed files with 1,174 additions and 1,201 deletions.
9 changes: 9 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ SRCS = develop/json.hpp \
develop/detail/iterators/iteration_proxy.hpp \
develop/detail/iterators/json_reverse_iterator.hpp \
develop/detail/iterators/primitive_iterator.hpp \
develop/detail/json_pointer.hpp \
develop/detail/json_ref.hpp \
develop/detail/macro_scope.hpp \
develop/detail/macro_unscope.hpp \
Expand Down Expand Up @@ -273,6 +274,14 @@ check-amalgamation:
@diff src/json.hpp src/json.hpp~ || (echo "===================================================================\n Amalgamation required! Please read the contribution guidelines\n in file .github/CONTRIBUTING.md.\n===================================================================" ; mv src/json.hpp~ src/json.hpp ; false)
@mv src/json.hpp~ src/json.hpp

# check if every header in develop includes sufficient headers to be compiled
# individually
check-single-includes:
for x in $(SRCS); do \
echo "#include \"$$x\"\nint main() {}\n" | sed 's|develop/||' > single_include_test.cpp; \
$(CXX) $(CXXFLAGS) -Idevelop -std=c++11 single_include_test.cpp -o single_include_test; \
rm single_include_test.cpp single_include_test; \
done

##########################################################################
# changelog
Expand Down
1 change: 1 addition & 0 deletions develop/detail/input/binary_reader.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <string> // char_traits, string
#include <utility> // make_pair, move

#include "detail/input/input_adapters.hpp"
#include "detail/exceptions.hpp"
#include "detail/macro_scope.hpp"
#include "detail/value_t.hpp"
Expand Down
Loading

0 comments on commit 1483d39

Please sign in to comment.