Skip to content

Update code from the upstream repo to v1.9.5 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 912 commits into from
Feb 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
912 commits
Select commit Hold shift + click to select a range
eb7bd95
Value::find(): Fix assert message
res2k Mar 23, 2019
d76fe56
Implement Value::demand()
res2k Mar 23, 2019
9a629bc
tests: Add a comment
res2k Mar 23, 2019
99a99d4
Cast to unsigned char in Value::setType() to appease gcc (issue #888)
res2k Mar 23, 2019
3e2f8d3
Merge pull request #902 from res2k/fix-888
cdunn2001 Mar 23, 2019
69402d1
Bump minor version, SOVERSION
res2k Mar 23, 2019
cd11212
Merge pull request #901 from res2k/demand
cdunn2001 Mar 30, 2019
b16abf8
Explicitly set JSON_API to 'default' visibility on clang & gcc
res2k Mar 22, 2019
27b9501
Fix build with libc++, closes #910
markand Apr 18, 2019
27290cf
Use version.md in dev.makefile
markand Apr 23, 2019
5b91551
Rename version.md to version.txt
markand Apr 23, 2019
0155f38
added cmake config version file for proper cmake delivery
oleurodecision Jun 3, 2019
8d2095a
cmake fixes
oleurodecision Jun 3, 2019
1234f42
Add missing classes to forwards.h
abigailbunyan Jun 3, 2019
85f5b1c
fixed typos
oleurodecision Jun 3, 2019
83cc921
Fix JSON_USE_EXCEPTION=0 use case
baylesj Jun 6, 2019
3e4c8f8
Merge pull request #935 from abigailbunyan/forward-declarations
baylesj Jun 24, 2019
518875d
Update AUTHORS
baylesj Jun 24, 2019
185dfd5
Update meson build requirement
baylesj Jun 24, 2019
12461e5
Create CONTRIBUTING.md
baylesj Jun 24, 2019
be4dc51
Update README.md
baylesj Jun 24, 2019
f7182a0
Update CONTRIBUTING.md
baylesj Jun 24, 2019
d5bd1a7
Run clang format
baylesj Jun 24, 2019
6935317
Merge pull request #952 from baylesj/update-meson-req
baylesj Jun 24, 2019
4babd12
Merge pull request #953 from baylesj/clang-format
baylesj Jun 24, 2019
56c41fb
Merge pull request #934 from oleurodecision/cmake_config_version
baylesj Jun 24, 2019
18e51e2
Update issue templates
baylesj Jun 24, 2019
2d211de
Update issue templates
baylesj Jun 24, 2019
2a3ae0e
Merge pull request #932 from oleurodecision/cmake_clean
baylesj Jun 25, 2019
408b466
Modernize Travis and Appveyor configs
baylesj Jun 25, 2019
c84f2e1
Update travis scripts
baylesj Jun 25, 2019
2690bc9
Update appveyor to use build images
baylesj Jun 25, 2019
101d479
Merge pull request #955 from baylesj/yaml-cleanups
baylesj Jun 25, 2019
dd6921f
Add WideString test for Issue #756
BillyDonahue May 28, 2018
d34479e
Issue 920: Fix android build with casting fix
baylesj Jun 24, 2019
5510f14
repair a typo error
dota17 May 31, 2019
b7feb2d
use fpclassify to test a float number is zero or nan
Jun 21, 2019
7c7ccbf
fix compile problem
Jun 21, 2019
c51d718
extract variable
Jun 25, 2019
629a727
version.h : wrong file was deployed, added required include path and
oleurodecision Jun 3, 2019
7868518
Add a simple fuzz test for jsoncpp.
Google-Autofuzz Jun 12, 2019
0e3b22d
Updated header and fixed the bug
Google-Autofuzz Jun 24, 2019
3247202
Updated fuzz.h
Google-Autofuzz Jun 24, 2019
2943441
Update fuzz.cpp
Google-Autofuzz Jun 24, 2019
46d3565
Update fuzz.h
Google-Autofuzz Jun 24, 2019
9d6db96
Update fuzz.h
Google-Autofuzz Jun 24, 2019
576b271
Update fuzz.cpp
Google-Autofuzz Jun 24, 2019
9725530
Update fuzz.h
Google-Autofuzz Jun 24, 2019
2939d85
Update fuzz.cpp
Google-Autofuzz Jun 24, 2019
d81a3ca
Update fuzz.h
Google-Autofuzz Jun 24, 2019
6d236e1
Update fuzz.cpp
Google-Autofuzz Jun 24, 2019
8e01024
fix llvm
Google-Autofuzz Jun 24, 2019
7e69f15
added llvm
Google-Autofuzz Jun 24, 2019
92cc773
Added include fuzz.cpp
Google-Autofuzz Jun 24, 2019
fdcd2fc
Update main.cpp
Google-Autofuzz Jun 24, 2019
caa2f3b
Update main.cpp
Google-Autofuzz Jun 24, 2019
13afd0e
Update main.cpp
Google-Autofuzz Jun 24, 2019
181f9eb
Update CMakeLists.txt
Google-Autofuzz Jun 24, 2019
400ec89
Update CMakeLists.txt
Google-Autofuzz Jun 24, 2019
336c300
Update jsontest.cpp
Google-Autofuzz Jun 24, 2019
c4d1cb1
Update jsontest.cpp
Google-Autofuzz Jun 24, 2019
bcc0472
Update jsontest.cpp
Google-Autofuzz Jun 24, 2019
d148e28
added fuzz.cpp to macro in main.cpp
Google-Autofuzz Jun 26, 2019
dc170e3
Update main.cpp
Google-Autofuzz Jun 26, 2019
879a5b8
Add fuzz.cpp to jsoncpp_test
Google-Autofuzz Jun 26, 2019
ddc9e0f
Run clang-format on the repository
baylesj Jun 27, 2019
44bc38f
Issue #633: Fix issue with maxInt
baylesj Jun 28, 2019
f8db40f
Update minimum CMake version requirement
baylesj Jun 28, 2019
95b3092
Fix comments on Json Reader
baylesj Jun 28, 2019
7924d3f
Update version.h.in header comments
baylesj Jul 1, 2019
3c32dca
adjust some codes position
dota17 Jul 2, 2019
60ba071
pop the root node after readValue()
dota17 Jul 2, 2019
9ef812a
\#964 Delete JSONCPP_NORETURN for [[noreturn]]
baylesj Jul 9, 2019
25c5781
Add new JSON_USE_NULLREF flag
baylesj Jul 11, 2019
645250b
\#979 Fix parseFromStream definition
baylesj Jul 11, 2019
b350794
Fix definition check for GNUC
baylesj Jul 12, 2019
483eba8
Improve code comment formatting (Issue #985)
BillyDonahue Jul 14, 2019
b27c83f
Delete JSONCPP_DEPRECATED, use [[deprecated]] instead. (#978)
dota17 Jul 17, 2019
12325b8
Cleanup versioning strategy (#989)
baylesj Jul 22, 2019
0d27381
Revert "Cleanup versioning strategy (#989)" (#996)
baylesj Jul 31, 2019
7b28698
Cleanup versioning strategy relanding (#989) (#997)
baylesj Aug 14, 2019
2cf939e
change Value::null to Value::nullSingleton() (#1000)
dota17 Aug 14, 2019
b941149
tests: Improve CharReaderFailIfExtraTest (#1011)
res2k Aug 26, 2019
c92c87b
Add some test cases in ValueTest (#1010)
dota17 Aug 26, 2019
472adb6
Fix a coupe of typos (#1007)
aliha Aug 26, 2019
fd94025
change the returned value (#1003)
dota17 Aug 26, 2019
21ab829
Add dictionary for fuzzing (#1020)
Google-Autofuzz Sep 16, 2019
3550a0a
add some testcases: WriteTest, StreamWriterTest (#1015)
dota17 Sep 16, 2019
7ef0f9f
[Language Conformance] Use constexpr restriction in jsoncpp (#1005)
dota17 Sep 16, 2019
db61dba
Improving Code Readability (#1004)
dota17 Sep 16, 2019
d622250
Check the comments array boundry. (#993)
dota17 Sep 16, 2019
abcd3f7
Modify code comments in write.h (#987)
dota17 Sep 16, 2019
c5cb313
Do not allow tokenError tokens after input if failIfExtra is set. (#1…
res2k Sep 16, 2019
2cb9a58
reinforce readToken function and add simple tests (#1012)
dota17 Sep 16, 2019
3013ed4
jsoncpp: Define JSON_USE_INT64_DOUBLE_CONVERSION for clang as well. (…
m-gupta Sep 16, 2019
18f790f
Issue 1021: Fix clang 10 compilation (#1023)
baylesj Sep 16, 2019
81ae1d5
Just run clang format (#1025)
baylesj Sep 16, 2019
c97bd59
add a testcase in ValueTest:CopyObject (#1028)
LPBruce Sep 17, 2019
21e3d21
pkgconfig: Fix for cross compilation (#1027)
neheb Sep 17, 2019
e9ccbe0
Create an example directory and add some code examples. (#944)
dota17 Sep 17, 2019
ae4dc9a
clang-tidy fixes (#1033)
neheb Sep 25, 2019
00b979f
Issue #970: Rename features.h to json_features.h (#1024)
baylesj Sep 25, 2019
d448610
Fixup Json::Value append methods, run clang format. (#1022)
baylesj Sep 25, 2019
00c2c9f
Supplement the testcase for comparing the Array and Null (#1031)
LPBruce Sep 25, 2019
227c7cd
Supplement the testcase for comparing object (#1032)
LPBruce Sep 25, 2019
7e97345
Add vcpkg installation instructions (#1037)
grdowns Oct 1, 2019
736409f
fix clang-format error for ci (#1036)
dota17 Oct 1, 2019
c4bc6da
Fix dead link in CONTRIBUTING.md (#1044)
kimsey0 Oct 10, 2019
f34bf24
Issue #958: Travis CI should enforce clang-format standards (#1026)
baylesj Oct 11, 2019
2ee3b1d
Re-add JSONCPP_NORETURN (#1041)
Oct 11, 2019
ddc0748
add testcases for writerTest [improve coverage] (#1039)
dota17 Oct 11, 2019
2e33c21
Fix fuzzer off by one error (#1047)
baylesj Oct 11, 2019
7329223
fix clang-format (#1049)
dota17 Oct 14, 2019
bcad4e4
clang-tidy cleanups 2 (#1048)
neheb Oct 15, 2019
c5f66ab
Test Framework Modify : Remove JSONTEST_REGISTER_FIXTURE (#1050)
dota17 Oct 15, 2019
bdacfd7
add a new method to insert a new value in an array at specific index.…
dota17 Oct 16, 2019
aebc7fa
BUG: New CMake features used that break backward compatibility
hjmjohnson Oct 16, 2019
a07b37e
Improve performance for comment parsing (#1052)
baylesj Oct 17, 2019
f59ac2a
add coveralls to test coverage (#1060)
dota17 Oct 17, 2019
a955529
Added emitUTF8 setting. (#1045)
nicolaswilson Oct 17, 2019
b082693
COMP: Improve const correctness for ValueIterators (#1056)
hjmjohnson Oct 17, 2019
41ffff0
Fix link to Amalgamated wiki article (#1064)
kimsey0 Oct 18, 2019
54bd178
update testcases to improve coverage (#1061)
dota17 Oct 23, 2019
6c9408d
remove pushError in CharReader (#1055)
dota17 Oct 23, 2019
c634b98
modify README.md: add some badges (#1070)
dota17 Oct 25, 2019
2703c30
add coverage badge in readme (#1072)
dota17 Oct 26, 2019
fb9aaf8
Update meson/python
cdunn2001 Nov 4, 2019
ec9302c
Avoid deprecated Meson feature
cdunn2001 Nov 4, 2019
638ad26
Explicitly specify hexfloat in TestResult operator<< (#1078)
BillyDonahue Nov 3, 2019
2eb20a9
Remove deprecated makerelease.py
cdunn2001 Nov 4, 2019
7429bb2
COMP: Fix type mismatch ambiguity
hjmjohnson Nov 4, 2019
5fb17a6
COMP: Remove shadow variable warning
hjmjohnson Nov 4, 2019
a86e129
ENH: Move to requiring python 3
hjmjohnson Nov 4, 2019
82b7367
add testcase for json_value.cpp to improve coverage [90+%]
dota17 Oct 26, 2019
ff58fdc
Update coverage badge (#1088)
dota17 Nov 7, 2019
645cd04
Number fixes (#1053)
baylesj Nov 9, 2019
53c8e2c
Issue 1066 (#1080)
BillyDonahue Nov 12, 2019
d2e6a97
some test coverage for Value::iterator (#1093)
BillyDonahue Nov 12, 2019
01db7b7
Allow trailing comma in objects
kimsey0 Oct 16, 2019
554d961
Allow trailing comma in arrays if dropped null placeholders are not a…
kimsey0 Oct 17, 2019
1c8f7d8
Run clang-format
kimsey0 Nov 4, 2019
781eec4
Merge pull request #1098 from cdunn2001/allow-trailing-commas
cdunn2001 Nov 14, 2019
9704ced
Issue 1100: Drop CPPTL support
baylesj Nov 14, 2019
a481201
Readd some overzealously removed code
baylesj Nov 14, 2019
cfc3e92
Merge pull request #1101 from open-source-parsers/drop_cpptl_support
cdunn2001 Nov 15, 2019
f200239
Add some testcases for charReader (#1095)
dota17 Nov 15, 2019
9e0d70a
eliminate some redundancy in test_lib_json/main.cpp (#1104)
BillyDonahue Nov 15, 2019
a0bd9ad
Add an insert overload function (#1110)
dota17 Dec 3, 2019
2983f5a
Run Clang-tidy with modernize-use-auto (#1077)
dota17 Dec 4, 2019
a3c8642
Add test cases for Reader (#1108)
dota17 Dec 4, 2019
d6c4a8f
tweak to avoid implicit narrowing warning. (#1114)
BillyDonahue Dec 11, 2019
92d9025
fix Reader bug and add testcase (#1122)
dota17 Dec 23, 2019
7e5485a
Add option JSONCPP_WITH_EXAMPLE (#1099)
theirix Dec 23, 2019
8f7f35c
Replace Raw Unicode in Testcase (#1127)
dota17 Dec 26, 2019
f11611c
json_writer: fix inverted sense in isAnyCharRequiredQuoting (#1120)
thefloweringash Dec 28, 2019
6bc55ec
Meson updates (#1124)
SoapGentoo Jan 7, 2020
6317f9a
fix compile warnning using cmake (#1132)
dota17 Jan 20, 2020
edf528e
clang-tidy fixes again (#1087)
neheb Feb 3, 2020
a6fe8e2
Use ccache right (#1139)
ClausKlein Feb 13, 2020
dc180eb
Remove '=delete' from template methods for Xcode 8 (#1133)
dgobbi Feb 13, 2020
3beb37e
revert trailing comma in old Reader (#1126)
dota17 Feb 13, 2020
90ca694
clang-tidy fixes again (#1155)
neheb Apr 12, 2020
2e54e8f
adding myself to AUTHORS as per commits (#1109)
stefanofiorentino Apr 24, 2020
8b20b7a
amalgamate: add version.h and allocator.h to the forwards header
mathstuf Dec 30, 2019
1ff6bb6
ninja test
cdunn2001 Apr 24, 2020
411d88f
Stop checking status; raise instead
cdunn2001 Apr 24, 2020
9e23f66
Issue 1102: Fixup test suite, fix broken tests
baylesj Nov 14, 2019
b349221
Cleanup test configurations
baylesj Nov 14, 2019
a0b8c3e
Do not run colliding tests at same time
cdunn2001 Apr 24, 2020
5813ab1
Merge branch 'fixup-tests' into 'master' (#1102)
cdunn2001 Apr 24, 2020
91f1553
Make throwRuntimeError/throwLogicError print msg when built with JSON…
bcsgh Mar 24, 2020
83946a2
Ignore byte order mark in the head of UTF-8 text. (#1149)
dota17 Apr 28, 2020
2cb16b3
allowBom -> skipBom (#1162)
dota17 Apr 28, 2020
a3afd74
Don't use unique variable for postfix
mrjoel Feb 19, 2020
c648b03
Consolidate setting of jsoncpp target properties
mrjoel Feb 19, 2020
5a0152a
Only set CMAKE_BUILD_TYPE for single config generators
mrjoel Dec 31, 2019
edc6239
Not needed to specify CMAKE_MACOSX_RPATH
mrjoel Dec 31, 2019
12ceb01
Always use consistent CXX_STANDARD
mrjoel Dec 31, 2019
30eb5ce
Check compiler using CMAKE_CXX_COMPILER_ID
mrjoel Jan 1, 2020
8a5e792
Add Clang support, be explicit about MSVC flags
mrjoel Jan 1, 2020
9abf119
Remove unused CMake variable
mrjoel Feb 18, 2020
524234e
Use non-version checked add_compile_options
mrjoel Jan 20, 2020
3f0d63b
Use internal CMake compiler version directly
mrjoel Feb 18, 2020
e9b0b96
Remove redundant cmake_minimum_required from example
mrjoel Feb 19, 2020
d517d59
Merge pull request #1165 from mrjoel/mrjoel/cmake-updates
cdunn2001 Apr 29, 2020
a4fb5db
Put ".exe" and ".dll" together to make test usable in build dir. (#1166)
xkszltl Apr 30, 2020
8b7ea09
Bump soversion to 24 (#1167)
dota17 Apr 30, 2020
d2d4c74
Update README.md and add dota17 to AUTHORS list. (#1168)
dota17 Apr 30, 2020
b8cb888
Added current dir specifier for PowerShell (#1169)
breyed May 8, 2020
e36cff1
clang-tidy + any_of usage (#1171)
neheb May 12, 2020
75b360a
spot fix #1171: isprint argument must be representable as unsigned ch…
BillyDonahue May 13, 2020
c161f4a
Escape control chars even if emitting UTF8 (#1178)
BillyDonahue May 21, 2020
6aba23f
Fixes Oss-Fuzz issue: 21916 (#1180)
kabeer27 May 29, 2020
9be5895
Issue 1182: Fix fuzzing bug (#1183)
baylesj May 31, 2020
b3189a0
avoid isprint, because it is locale specific (#1189)
BillyDonahue Jun 11, 2020
632044a
Billy donahue avoid isprint (#1191)
BillyDonahue Jun 11, 2020
c8453d3
Delete nullptr Json::Value constructor (#1194)
nathanruiz Jun 23, 2020
cfc1ad7
Enhance cmake script (#1197)
dota17 Jul 13, 2020
bf0cfa5
hot fix for building static lib (#1203)
dota17 Jul 14, 2020
5be07bd
Fix generation of pkg-config file with absolute includedir/libdir. (#…
lopsided98 Jul 20, 2020
45733df
meson: Don't specifically look for python3
diizzyy Jun 3, 2020
9059f5c
Roll version numbers for 1.9.4 release (#1223)
baylesj Sep 26, 2020
72db276
version.h: fix the version number in the header
mathstuf Oct 1, 2020
c60ebf7
test: ensure the version numbers agree
mathstuf Oct 1, 2020
5d1cb30
clang-format
cdunn2001 Oct 10, 2020
1664b6b
Try meson/ninja from pypi
cdunn2001 Oct 10, 2020
bb9db78
Do not allow failures on osx
cdunn2001 Oct 10, 2020
5f4e104
Merge pull request #1229 from open-source-parsers/pypi
cdunn2001 Oct 10, 2020
30170d6
Fix c++20 compilation problem for clang10 and fix potential bug due t…
Oct 13, 2020
ceae0e3
Fix clang-tidy warnings (#1231)
oppm Nov 6, 2020
8954092
ENH: Prevent cmake in source builds (#1091)
hjmjohnson Nov 6, 2020
9409824
Fix a precision bug of valueToString, prevent to give an error result…
sclei Dec 15, 2020
be4a512
Remove trailing space characters (#1256)
cdunn2001 Jan 10, 2021
5c4219b
Update version in dox
cdunn2001 Jan 10, 2021
fe9663e
`Json::ValueIterator` operators `*` and `->` need to be const
BillyDonahue Dec 21, 2020
eab8ebe
Disable also Visual Studio warning C4275 (std::exception used as base…
rickyviking Jan 4, 2021
c9a9762
minor fixes for 64 bits and refactor code
GermanAizek Jan 15, 2021
ac28702
Fixed pkg-config Version
dvigne Jan 26, 2021
da9e17d
allow selection of Windows MSVC runtime
yxlao Jan 18, 2021
fda274d
Fix Value::resize to fill all array elements (#1265)
BillyDonahue Feb 10, 2021
09c5ecd
only append _static suffix for microsoft toolchains
skoehler Feb 3, 2021
b1bd848
fix sign-conversion warning (#1268)
BillyDonahue Feb 20, 2021
1ee39a6
add comment for emitUTF8 in header
PinkD Mar 2, 2021
94cda30
Rearrange Comments::set (#1278)
BillyDonahue Mar 18, 2021
b640795
- exported targets go to separate generated file and package config …
sergeyrachev Feb 27, 2021
62f3e03
- declare namespaced export target to simplify the library usage
sergeyrachev Feb 27, 2021
cee42e0
- empty line at end of file
sergeyrachev Feb 27, 2021
a3914b7
- narrowed lines to be aligned with overall file line width
sergeyrachev Mar 6, 2021
2af4a4c
- workaround for CMake < 3.18 ALIAS target limitation to not point to…
sergeyrachev Apr 2, 2021
993e4e2
- isolated namespace targets into separate file
sergeyrachev Apr 14, 2021
bb34617
Merge branch 'cmake-config-improvements' #1271
cdunn2001 May 5, 2021
ed1ab7a
Avoid getline(s, EOF)
cdunn2001 May 5, 2021
5fabc5e
conversion errors only if warnings as errors enabled (#1284)
SpaceIm May 6, 2021
375a111
Add support for Bazel build system (#1275)
mglb May 6, 2021
65bb1b1
CMake: Remove ancient version checks (#1299)
ferdnyc Jun 23, 2021
c39fbda
minor fix for code examples (#1317)
jack-ullery Aug 12, 2021
94a6220
Document skipBom in CharReaderBuilder (#1332)
axic Sep 21, 2021
fa747b1
clang-format is not available by default
cdunn2001 Oct 26, 2021
29f9853
Fix cmake config for POSITION_INDEPENDENT_CODE enabling it just when …
fjtrujy Oct 25, 2021
b22302e
Merge pull request #1347 from fjtrujy/position_independent_code
cdunn2001 Nov 3, 2021
54a5432
Drop compile-time deprecation warning
cdunn2001 Nov 3, 2021
c4904b2
Bump micro version
cdunn2001 Nov 3, 2021
5defb4e
Merge pull request #1351 from open-source-parsers/drop-deprecation-wa…
cdunn2001 Nov 3, 2021
2d55c74
Parse large floats as infinity (#1349) (#1353)
terokinnunen Dec 15, 2021
a1f1613
Fix various typos (#1350)
luzpaz Dec 15, 2021
42e892d
Use default rather than hard-coded 8 for maximum aggregate member ali…
jrtc27 Jan 12, 2022
8190e06
Fix wrong usage of doxygen groups (#1417)
mwestphal Jul 14, 2022
fc6ce76
Update .gitignore to ignore /out/ and /.vs/ dirs
mike-malburg Feb 15, 2023
3385b6b
Make string to double conversion locale invariant.
mike-malburg Feb 23, 2023
3d4ef42
Merge branch 'main' into update/upstream/1.9.5
mike-malburg Feb 24, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 3 additions & 46 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,47 +1,4 @@
---
# BasedOnStyle: LLVM
AccessModifierOffset: -2
ConstructorInitializerIndentWidth: 4
AlignEscapedNewlinesLeft: false
AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakTemplateDeclarations: false
AlwaysBreakBeforeMultilineStrings: false
BreakBeforeBinaryOperators: false
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BinPackParameters: false
ColumnLimit: 80
ConstructorInitializerAllOnOneLineOrOnePerLine: false
DerivePointerBinding: false
ExperimentalAutoDetectBinPacking: false
IndentCaseLabels: false
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCSpaceBeforeProtocolList: true
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 60
PenaltyBreakString: 1000
PenaltyBreakFirstLessLess: 120
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
PointerBindsToType: true
SpacesBeforeTrailingComments: 1
Cpp11BracedListStyle: false
Standard: Cpp03
IndentWidth: 2
TabWidth: 8
UseTab: Never
BreakBeforeBraces: Attach
IndentFunctionDeclarationAfterType: false
SpacesInParentheses: false
SpacesInAngles: false
SpaceInEmptyParentheses: false
SpacesInCStyleCastParentheses: false
SpaceAfterControlStatementKeyword: true
SpaceBeforeAssignmentOperators: true
ContinuationIndentWidth: 4
...
BasedOnStyle: LLVM
DerivePointerAlignment: false
PointerAlignment: Left

11 changes: 11 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
Checks: 'google-readability-casting,modernize-deprecated-headers,modernize-loop-convert,modernize-use-auto,modernize-use-default-member-init,modernize-use-using,readability-else-after-return,readability-redundant-member-init,readability-redundant-string-cstr'
WarningsAsErrors: ''
HeaderFilterRegex: ''
AnalyzeTemporaryDtors: false
FormatStyle: none
CheckOptions:
- key: modernize-use-using.IgnoreMacros
value: '0'
...

11 changes: 11 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
* text=auto
*.h text
*.cpp text
*.json text
*.in text
*.sh eol=lf
*.bat eol=crlf
*.vcproj eol=crlf
*.vcxproj eol=crlf
*.sln eol=crlf
devtools/agent_vm* eol=crlf
26 changes: 26 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1.

**Expected behavior**
A clear and concise description of what you expected to happen.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Meson version
- Ninja version

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
50 changes: 48 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,59 @@
/build/
/build-*/
*.pyc
*.swp
*.actual
*.actual-rewrite
*.process-output
*.rewrite
/bin/
/buildscons/
/libs/
/doc/doxyfile
/dist/
#/include/json/version.h
/.cache/
/.vs/
/out/

# MSVC project files:
*.sln
*.vcxproj
*.filters
*.user
*.sdf
*.opensdf
*.suo

# MSVC build files:
*.lib
*.obj
*.tlog/
*.pdb

# CMake-generated files:
CMakeFiles/
/pkg-config/jsoncpp.pc
jsoncpp_lib_static.dir/
compile_commands.json

# In case someone runs cmake in the root-dir:
/CMakeCache.txt
/Makefile
/include/Makefile
/src/Makefile
/src/jsontestrunner/Makefile
/src/jsontestrunner/jsontestrunner_exe
/src/lib_json/Makefile
/src/test_lib_json/Makefile
/src/test_lib_json/jsoncpp_test
*.a

# eclipse project files
.project
.cproject
/.settings/

# DS_Store
.DS_Store

# temps
/version
85 changes: 69 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,71 @@
# Build matrix / environment variable are explained on:
# http://about.travis-ci.org/docs/user/build-configuration/
# This file can be validated on:
# http://lint.travis-ci.org/
before_install: sudo apt-get install cmake
# Build matrix / environment variables are explained on:
# http://about.travis-ci.com/docs/user/build-configuration/
# This file can be validated on: http://www.yamllint.com/
# Or using the Ruby based travel command line tool:
# gem install travis --no-rdoc --no-ri
# travis lint .travis.yml
language: cpp
compiler:
- gcc
- clang
script: cmake -DJSONCPP_LIB_BUILD_SHARED=$SHARED_LIBRARY -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_VERBOSE_MAKEFILE=$VERBOSE_MAKE . && make
env:
matrix:
- SHARED_LIBRARY=ON BUILD_TYPE=release VERBOSE_MAKE=false
- SHARED_LIBRARY=OFF BUILD_TYPE=release VERBOSE_MAKE=false
- SHARED_LIBRARY=OFF BUILD_TYPE=debug VERBOSE VERBOSE_MAKE=true
sudo: false
addons:
homebrew:
packages:
- clang-format
- meson
- ninja
update: false # do not update homebrew by default
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-xenial-8
packages:
- clang-format-8
- clang-8
- valgrind
matrix:
include:
- name: Mac clang meson static release testing
os: osx
osx_image: xcode11
compiler: clang
env:
CXX="clang++"
CC="clang"
LIB_TYPE=static
BUILD_TYPE=release
script: ./.travis_scripts/meson_builder.sh
- name: Linux xenial clang meson static release testing
os: linux
dist: xenial
compiler: clang
env:
CXX="clang++"
CC="clang"
LIB_TYPE=static
BUILD_TYPE=release
PYTHONUSERBASE="$(pwd)/LOCAL"
PATH="$PYTHONUSERBASE/bin:$PATH"
# before_install and install steps only needed for linux meson builds
before_install:
- source ./.travis_scripts/travis.before_install.${TRAVIS_OS_NAME}.sh
install:
- source ./.travis_scripts/travis.install.${TRAVIS_OS_NAME}.sh
script: ./.travis_scripts/meson_builder.sh
- name: Linux xenial gcc cmake coverage
os: linux
dist: xenial
compiler: gcc
env:
CXX=g++
CC=gcc
DO_Coverage=ON
BUILD_TOOL="Unix Makefiles"
BUILD_TYPE=Debug
LIB_TYPE=shared
DESTDIR=/tmp/cmake_json_cpp
before_install:
- pip install --user cpp-coveralls
script: ./.travis_scripts/cmake_builder.sh
after_success:
- coveralls --include src/lib_json --include include
notifications:
email:
- aaronjjacobs@gmail.com
email: false
Loading