Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
畅游知识海洋
json
提交
24c588cd
J
json
项目概览
畅游知识海洋
/
json
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
json
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
24c588cd
编写于
9月 11, 2016
作者:
N
Niels
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'release/2.0.4' into develop
上级
15925469
768d6656
变更
41
隐藏空白更改
内联
并排
Showing
41 changed file
with
46 addition
and
39 deletion
+46
-39
CMakeLists.txt
CMakeLists.txt
+1
-1
ChangeLog.md
ChangeLog.md
+7
-0
README.md
README.md
+1
-1
doc/Doxyfile
doc/Doxyfile
+1
-1
doc/examples/README.link
doc/examples/README.link
+1
-1
doc/index.md
doc/index.md
+1
-1
doc/json.gif
doc/json.gif
+0
-0
src/json.hpp
src/json.hpp
+1
-1
src/json.hpp.re2c
src/json.hpp.re2c
+1
-1
test/src/fuzz.cpp
test/src/fuzz.cpp
+1
-1
test/src/unit-algorithms.cpp
test/src/unit-algorithms.cpp
+1
-1
test/src/unit-allocator.cpp
test/src/unit-allocator.cpp
+1
-1
test/src/unit-capacity.cpp
test/src/unit-capacity.cpp
+1
-1
test/src/unit-class_const_iterator.cpp
test/src/unit-class_const_iterator.cpp
+1
-1
test/src/unit-class_iterator.cpp
test/src/unit-class_iterator.cpp
+1
-1
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
+1
-1
test/src/unit-comparison.cpp
test/src/unit-comparison.cpp
+1
-1
test/src/unit-concepts.cpp
test/src/unit-concepts.cpp
+1
-1
test/src/unit-constructor1.cpp
test/src/unit-constructor1.cpp
+1
-1
test/src/unit-constructor2.cpp
test/src/unit-constructor2.cpp
+1
-1
test/src/unit-convenience.cpp
test/src/unit-convenience.cpp
+1
-1
test/src/unit-conversions.cpp
test/src/unit-conversions.cpp
+1
-1
test/src/unit-deserialization.cpp
test/src/unit-deserialization.cpp
+1
-1
test/src/unit-element_access1.cpp
test/src/unit-element_access1.cpp
+1
-1
test/src/unit-element_access2.cpp
test/src/unit-element_access2.cpp
+1
-1
test/src/unit-inspection.cpp
test/src/unit-inspection.cpp
+1
-1
test/src/unit-iterator_wrapper.cpp
test/src/unit-iterator_wrapper.cpp
+1
-1
test/src/unit-iterators1.cpp
test/src/unit-iterators1.cpp
+1
-1
test/src/unit-iterators2.cpp
test/src/unit-iterators2.cpp
+1
-1
test/src/unit-json_patch.cpp
test/src/unit-json_patch.cpp
+1
-1
test/src/unit-json_pointer.cpp
test/src/unit-json_pointer.cpp
+1
-1
test/src/unit-modifiers.cpp
test/src/unit-modifiers.cpp
+1
-1
test/src/unit-pointer_access.cpp
test/src/unit-pointer_access.cpp
+1
-1
test/src/unit-readme.cpp
test/src/unit-readme.cpp
+1
-1
test/src/unit-reference_access.cpp
test/src/unit-reference_access.cpp
+1
-1
test/src/unit-regression.cpp
test/src/unit-regression.cpp
+1
-1
test/src/unit-serialization.cpp
test/src/unit-serialization.cpp
+1
-1
test/src/unit-testsuites.cpp
test/src/unit-testsuites.cpp
+1
-1
test/src/unit-unicode.cpp
test/src/unit-unicode.cpp
+1
-1
test/src/unit.cpp
test/src/unit.cpp
+1
-1
未找到文件。
CMakeLists.txt
浏览文件 @
24c588cd
cmake_minimum_required
(
VERSION 3.0
)
# define the project
project
(
nlohmann_json VERSION 2.0.
3
LANGUAGES CXX
)
project
(
nlohmann_json VERSION 2.0.
4
LANGUAGES CXX
)
enable_testing
()
...
...
ChangeLog.md
浏览文件 @
24c588cd
# Change Log
All notable changes to this project will be documented in this file. This project adheres to
[
Semantic Versioning
](
http://semver.org/
)
.
## [v2.0.4](https://github.com/nlohmann/json/releases/tag/v2.0.4) (2016-09-11)
[
Full Changelog
](
https://github.com/nlohmann/json/compare/v2.0.3...v2.0.4
)
-
Parsing fails without space at end of file
[
\#306
](
https://github.com/nlohmann/json/issues/306
)
-
Unused variable warning
[
\#304
](
https://github.com/nlohmann/json/issues/304
)
## [v2.0.3](https://github.com/nlohmann/json/releases/tag/v2.0.3) (2016-08-31)
[
Full Changelog
](
https://github.com/nlohmann/json/compare/v2.0.2...v2.0.3
)
...
...
README.md
浏览文件 @
24c588cd
...
...
@@ -3,7 +3,7 @@
[
![Build Status
](
https://travis-ci.org/nlohmann/json.svg?branch=master
)
](https://travis-ci.org/nlohmann/json)
[
![Build Status
](
https://ci.appveyor.com/api/projects/status/1acb366xfyg3qybk/branch/develop?svg=true
)
](https://ci.appveyor.com/project/nlohmann/json)
[
![Coverage Status
](
https://img.shields.io/coveralls/nlohmann/json.svg
)
](https://coveralls.io/r/nlohmann/json)
[
![Try online
](
https://img.shields.io/badge/try-online-blue.svg
)
](http://melpon.org/wandbox/permlink/
zkFPohcXJ2TFuAyq
)
[
![Try online
](
https://img.shields.io/badge/try-online-blue.svg
)
](http://melpon.org/wandbox/permlink/
MN72DYughLUXjVLk
)
[
![Documentation
](
https://img.shields.io/badge/docs-doxygen-blue.svg
)
](http://nlohmann.github.io/json)
[
![GitHub license
](
https://img.shields.io/badge/license-MIT-blue.svg
)
](https://raw.githubusercontent.com/nlohmann/json/master/LICENSE.MIT)
[
![Github Releases
](
https://img.shields.io/github/release/nlohmann/json.svg
)
](https://github.com/nlohmann/json/releases)
...
...
doc/Doxyfile
浏览文件 @
24c588cd
...
...
@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = "JSON for Modern C++"
PROJECT_NUMBER = 2.0.
3
PROJECT_NUMBER = 2.0.
4
PROJECT_BRIEF =
PROJECT_LOGO =
OUTPUT_DIRECTORY = .
...
...
doc/examples/README.link
浏览文件 @
24c588cd
<a target="_blank" href="http://melpon.org/wandbox/permlink/zkFPohcXJ2TFuAyq"><b>online</b></a>
\ No newline at end of file
<a target="_blank" href="http://melpon.org/wandbox/permlink/MN72DYughLUXjVLk"><b>online</b></a>
\ No newline at end of file
doc/index.md
浏览文件 @
24c588cd
...
...
@@ -268,4 +268,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.
3
@version 2.0.
4
doc/json.gif
查看替换文件 @
15925469
浏览文件 @
24c588cd
439.9 KB
|
W:
|
H:
439.8 KB
|
W:
|
H:
2-up
Swipe
Onion skin
src/json.hpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
src/json.hpp.re2c
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/fuzz.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (fuzz test support)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Run "make fuzz_testing" and follow the instructions.
...
...
test/src/unit-algorithms.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-allocator.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-capacity.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-class_const_iterator.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-class_iterator.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-class_lexer.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-class_parser.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-comparison.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-concepts.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-constructor1.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-constructor2.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-convenience.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-conversions.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-deserialization.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-element_access1.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-element_access2.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-inspection.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-iterator_wrapper.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-iterators1.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-iterators2.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-json_patch.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-json_pointer.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-modifiers.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-pointer_access.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-readme.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-reference_access.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-regression.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-serialization.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-testsuites.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit-unicode.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
test/src/unit.cpp
浏览文件 @
24c588cd
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 2.0.
3
| | |__ | | | | | | version 2.0.
4
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录