Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
json
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
json
Commits
bc289421
Commit
bc289421
authored
Dec 02, 2016
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Plain Diff
🔖
Merge branch 'release/2.0.8' into develop
parents
60b7299f
44c0f811
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
40 changed files
with
39 additions
and
39 deletions
+39
-39
CMakeLists.txt
CMakeLists.txt
+1
-1
ChangeLog.md
ChangeLog.md
+0
-0
Doxyfile
doc/Doxyfile
+1
-1
README.link
doc/examples/README.link
+2
-2
index.md
doc/index.md
+1
-1
json.gif
doc/json.gif
+0
-0
json.hpp
src/json.hpp
+1
-1
json.hpp.re2c
src/json.hpp.re2c
+1
-1
fuzz.cpp
test/src/fuzz.cpp
+1
-1
unit-algorithms.cpp
test/src/unit-algorithms.cpp
+1
-1
unit-allocator.cpp
test/src/unit-allocator.cpp
+1
-1
unit-capacity.cpp
test/src/unit-capacity.cpp
+1
-1
unit-class_const_iterator.cpp
test/src/unit-class_const_iterator.cpp
+1
-1
unit-class_iterator.cpp
test/src/unit-class_iterator.cpp
+1
-1
unit-class_lexer.cpp
test/src/unit-class_lexer.cpp
+1
-1
unit-class_parser.cpp
test/src/unit-class_parser.cpp
+1
-1
unit-comparison.cpp
test/src/unit-comparison.cpp
+1
-1
unit-concepts.cpp
test/src/unit-concepts.cpp
+1
-1
unit-constructor1.cpp
test/src/unit-constructor1.cpp
+1
-1
unit-constructor2.cpp
test/src/unit-constructor2.cpp
+1
-1
unit-convenience.cpp
test/src/unit-convenience.cpp
+1
-1
unit-conversions.cpp
test/src/unit-conversions.cpp
+1
-1
unit-deserialization.cpp
test/src/unit-deserialization.cpp
+1
-1
unit-element_access1.cpp
test/src/unit-element_access1.cpp
+1
-1
unit-element_access2.cpp
test/src/unit-element_access2.cpp
+1
-1
unit-inspection.cpp
test/src/unit-inspection.cpp
+1
-1
unit-iterator_wrapper.cpp
test/src/unit-iterator_wrapper.cpp
+1
-1
unit-iterators1.cpp
test/src/unit-iterators1.cpp
+1
-1
unit-iterators2.cpp
test/src/unit-iterators2.cpp
+1
-1
unit-json_patch.cpp
test/src/unit-json_patch.cpp
+1
-1
unit-json_pointer.cpp
test/src/unit-json_pointer.cpp
+1
-1
unit-modifiers.cpp
test/src/unit-modifiers.cpp
+1
-1
unit-pointer_access.cpp
test/src/unit-pointer_access.cpp
+1
-1
unit-readme.cpp
test/src/unit-readme.cpp
+1
-1
unit-reference_access.cpp
test/src/unit-reference_access.cpp
+1
-1
unit-regression.cpp
test/src/unit-regression.cpp
+1
-1
unit-serialization.cpp
test/src/unit-serialization.cpp
+1
-1
unit-testsuites.cpp
test/src/unit-testsuites.cpp
+1
-1
unit-unicode.cpp
test/src/unit-unicode.cpp
+1
-1
unit.cpp
test/src/unit.cpp
+1
-1
No files found.
CMakeLists.txt
View file @
bc289421
cmake_minimum_required
(
VERSION 3.0
)
# define the project
project
(
nlohmann_json VERSION 2.0.
7
LANGUAGES CXX
)
project
(
nlohmann_json VERSION 2.0.
8
LANGUAGES CXX
)
enable_testing
()
...
...
ChangeLog.md
View file @
bc289421
This diff is collapsed.
Click to expand it.
doc/Doxyfile
View file @
bc289421
...
...
@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = "JSON for Modern C++"
PROJECT_NUMBER = 2.0.
7
PROJECT_NUMBER = 2.0.
8
PROJECT_BRIEF =
PROJECT_LOGO =
OUTPUT_DIRECTORY = .
...
...
doc/examples/README.link
View file @
bc289421
<a target="_blank" href="http://melpon.org/wandbox/permlink/fsf5FqYe6GoX68W6"><b>online</b></a>
\ No newline at end of file
<a target="_blank" href="http://melpon.org/wandbox/permlink/G6Pdtdxq01HJvvJz"><b>online</b></a>
\ No newline at end of file
doc/index.md
View file @
bc289421
...
...
@@ -277,4 +277,4 @@ The container functions known from STL have been extended to support the differe
@author
[
Niels Lohmann
](
http://nlohmann.me
)
@see https://github.com/nlohmann/json to download the source code
@version 2.0.
7
@version 2.0.
8
doc/json.gif
View replaced file @
60b7299f
View file @
bc289421
This diff is collapsed.
Click to expand it.
src/json.hpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
src/json.hpp.re2c
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/fuzz.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (fuzz test support)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Run "make fuzz_testing" and follow the instructions.
...
...
test/src/unit-algorithms.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-allocator.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-capacity.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-class_const_iterator.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-class_iterator.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-class_lexer.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-class_parser.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-comparison.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-concepts.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-constructor1.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-constructor2.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-convenience.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-conversions.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-deserialization.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-element_access1.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-element_access2.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-inspection.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-iterator_wrapper.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-iterators1.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-iterators2.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-json_patch.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-json_pointer.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-modifiers.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-pointer_access.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-readme.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-reference_access.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-regression.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-serialization.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-testsuites.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-unicode.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit.cpp
View file @
bc289421
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
7
| | |__ | | | | | | version 2.0.
8
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
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