Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
1483d39c
Unverified
Commit
1483d39c
authored
7 years ago
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
moved class json_pointer into separate file #920
parent
e95578f8
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
1174 additions
and
1201 deletions
+1174
-1201
Makefile
Makefile
+9
-0
develop/detail/input/binary_reader.hpp
develop/detail/input/binary_reader.hpp
+1
-0
develop/detail/json_pointer.hpp
develop/detail/json_pointer.hpp
+696
-0
develop/detail/output/serializer.hpp
develop/detail/output/serializer.hpp
+3
-0
develop/json.hpp
develop/json.hpp
+3
-725
develop/json_fwd.hpp
develop/json_fwd.hpp
+1
-0
src/json.hpp
src/json.hpp
+461
-476
No files found.
Makefile
View file @
1483d39c
...
@@ -16,6 +16,7 @@ SRCS = develop/json.hpp \
...
@@ -16,6 +16,7 @@ SRCS = develop/json.hpp \
develop/detail/iterators/iteration_proxy.hpp
\
develop/detail/iterators/iteration_proxy.hpp
\
develop/detail/iterators/json_reverse_iterator.hpp
\
develop/detail/iterators/json_reverse_iterator.hpp
\
develop/detail/iterators/primitive_iterator.hpp
\
develop/detail/iterators/primitive_iterator.hpp
\
develop/detail/json_pointer.hpp
\
develop/detail/json_ref.hpp
\
develop/detail/json_ref.hpp
\
develop/detail/macro_scope.hpp
\
develop/detail/macro_scope.hpp
\
develop/detail/macro_unscope.hpp
\
develop/detail/macro_unscope.hpp
\
...
@@ -273,6 +274,14 @@ check-amalgamation:
...
@@ -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
)
@
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
@
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
\"\n
int 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
# changelog
...
...
This diff is collapsed.
Click to expand it.
develop/detail/input/binary_reader.hpp
View file @
1483d39c
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
#include <string> // char_traits, string
#include <string> // char_traits, string
#include <utility> // make_pair, move
#include <utility> // make_pair, move
#include "detail/input/input_adapters.hpp"
#include "detail/exceptions.hpp"
#include "detail/exceptions.hpp"
#include "detail/macro_scope.hpp"
#include "detail/macro_scope.hpp"
#include "detail/value_t.hpp"
#include "detail/value_t.hpp"
...
...
This diff is collapsed.
Click to expand it.
develop/detail/json_pointer.hpp
0 → 100644
View file @
1483d39c
This diff is collapsed.
Click to expand it.
develop/detail/output/serializer.hpp
View file @
1483d39c
...
@@ -9,11 +9,14 @@
...
@@ -9,11 +9,14 @@
#include <cstddef> // size_t, ptrdiff_t
#include <cstddef> // size_t, ptrdiff_t
#include <cstdint> // uint8_t
#include <cstdint> // uint8_t
#include <cstdio> // snprintf
#include <cstdio> // snprintf
#include <iomanip> // setfill
#include <iterator> // next
#include <iterator> // next
#include <limits> // numeric_limits
#include <limits> // numeric_limits
#include <string> // string
#include <string> // string
#include <sstream> // stringstream
#include <type_traits> // is_same
#include <type_traits> // is_same
#include "detail/exceptions.hpp"
#include "detail/conversions/to_chars.hpp"
#include "detail/conversions/to_chars.hpp"
#include "detail/macro_scope.hpp"
#include "detail/macro_scope.hpp"
#include "detail/meta.hpp"
#include "detail/meta.hpp"
...
...
This diff is collapsed.
Click to expand it.
develop/json.hpp
View file @
1483d39c
This diff is collapsed.
Click to expand it.
develop/json_fwd.hpp
View file @
1483d39c
...
@@ -47,6 +47,7 @@ within a JSON document. It can be used with functions `at` and
...
@@ -47,6 +47,7 @@ within a JSON document. It can be used with functions `at` and
@since version 2.0.0
@since version 2.0.0
*/
*/
template
<
typename
BasicJsonType
>
class
json_pointer
;
class
json_pointer
;
/*!
/*!
...
...
This diff is collapsed.
Click to expand it.
src/json.hpp
View file @
1483d39c
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment