Skip to content
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

conversion from/to user-defined types #435

Merged
merged 101 commits into from
Jan 27, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
b443edf
add first version support for user-defined types
Oct 16, 2016
fe628b5
anonymous namespace renamed to detail
theodelrieu Oct 17, 2016
d54d6bb
add alias templates to reduce boilerplate
theodelrieu Oct 18, 2016
877d96c
rename __static_const to _static_const (reserved identifier)
Oct 20, 2016
12b4555
use uncvref_t<T> instead of remove_cv_t<remove_reference_t<T>>>
Oct 20, 2016
03b391c
remove has_destructor and has_json_traits, use decltype instead
Oct 20, 2016
4cdc61e
move most SFINAE trickery in to/from_json_fn
Oct 21, 2016
7dc268e
add first version for alternate implementation
theodelrieu Nov 7, 2016
33abccf
add template arguments for JSONSerializer
Nov 8, 2016
837b81d
renamed unit-constructor3.cpp to unit-udt.cpp
Nov 8, 2016
2bc685f
to_json and from_json takes both two arguments now
theodelrieu Nov 9, 2016
178441c
add basic test for custom serializer
Nov 15, 2016
23bd2bc
add is_compatible_* traits
theodelrieu Nov 16, 2016
8881944
remove constraints on JSONSerializer instances, constrain correctly n…
theodelrieu Nov 16, 2016
0d91113
add negation, disjunction, and conjunction from C++17
theodelrieu Nov 20, 2016
e2dbe7a
correctly constrain basic_json udt constructor
Nov 21, 2016
9b40197
add a macro for has_xxx types
Nov 17, 2016
ee19aca
add is_compatible_basic_json_type trait
Nov 21, 2016
47bc402
only use conjunction & co when needed to avoid MSVC crashing
Nov 22, 2016
907484f
format biggest lines
theodelrieu Nov 23, 2016
74bb11d
remove some useless checks, format a bit, added some comments
Nov 24, 2016
e5999c6
add a few tests
theodelrieu Nov 26, 2016
60e6f82
add support for non-default-constructible udt
Nov 29, 2016
c0c72b5
rewrite unit-udt: basic usage
Nov 30, 2016
1eafac7
remove explicit keyword on udt-constructor
theodelrieu Dec 4, 2016
f5cb089
add an enum constructor (quickfix)
theodelrieu Dec 7, 2016
8e43d47
add more tests to unit-udt.cpp
theodelrieu Dec 13, 2016
3d405c6
add support for enum classes
theodelrieu Dec 13, 2016
7e750ec
fix msvc, by doubling parenthesis on catch assertions
theodelrieu Dec 14, 2016
1c21c87
use u8 prefix in unit-udt.cpp
theodelrieu Dec 14, 2016
d5ee583
add more tests
theodelrieu Dec 14, 2016
aa2679a
fix tests, avoid instantiating JSONSerializer when it will not be used
Dec 15, 2016
be1d3de
:lipstick: moved changes to re2c file and ran `make pretty`
nlohmann Dec 18, 2016
034d5ed
:lipstick: some cleanup
nlohmann Dec 18, 2016
d359684
move enum class value_t outside of basic_json
Jan 7, 2017
c833b22
move type_name outside of basic_json, make it a friend
Jan 7, 2017
6b89785
replace constructor by from/to_json: boolean_t
Jan 7, 2017
bbe4064
replace constructor by from/to_json: string_t
Jan 7, 2017
d257149
replace constructor by from/to_json: number_float_t
Jan 7, 2017
a32de3b
replace constructor by from/to_json: number_unsigned_t
Jan 8, 2017
f008983
replace constructor by from/to_json: number_integer_t
Jan 8, 2017
6d427ac
replace constructor by from/to_json: unscoped enum types
Jan 8, 2017
c847e0e
replace constructor by from/to_json: array_t
Jan 8, 2017
7e6a6f9
replace constructor by from/to_json: array_t
Jan 8, 2017
4e8089b
remove old get/get_impl overloads (doc removal is of course temporary)
Jan 8, 2017
317883b
cleanup, details in body
Jan 8, 2017
be6b417
tweak SFINAE checks for internal types (see commit body)
Jan 8, 2017
b2543e0
removed is_compatible_float_type trait
Jan 8, 2017
b4cea68
remove is_compatible_array_type_impl trait
Jan 8, 2017
5839795
remove useless helpers
Jan 8, 2017
29f9fe6
remove one has_to/from_json template parameter
Jan 8, 2017
1f25ec5
add some constexpr + noexcept
Jan 8, 2017
3494014
new unit-udt.cpp tests
Jan 8, 2017
cb3d455
do not const_cast when calling get_ptr
Jan 9, 2017
e678c07
check for is_number_unsigned before is_number_integer
Jan 9, 2017
d0d8070
add static_asserts
theodelrieu Jan 12, 2017
e247e01
use static_casts to silence MSVC warnings
theodelrieu Jan 12, 2017
a9d5ae4
put back a specialization for containers with a reserve method
Jan 14, 2017
1554baa
attempting to fix coverage. testing that reserve is called
Jan 14, 2017
b801287
add noexcept checks, and some missing noexcepts
Jan 14, 2017
63e4249
use a priority_tag instead of int and longs with sfinae-dispatch
Jan 14, 2017
f2c71fa
minor message/comments tweak
Jan 14, 2017
f1482d1
more tests in unit-udt
Jan 14, 2017
07bc82d
put const to the left
Jan 15, 2017
68081cd
remove useless file
Jan 15, 2017
794dae8
apply changes to json.hpp.re2c
Jan 15, 2017
e60e458
move static_const to the detail namespace
Jan 15, 2017
1d87097
remove some boilerplate
Jan 15, 2017
af94e71
add basic doxygen documentations
Jan 15, 2017
b56117b
add noexcept tests
Jan 16, 2017
fbac056
add readme
Jan 16, 2017
3e15b55
run make pretty
Jan 17, 2017
447c6a6
run make re2c
Jan 17, 2017
1e20887
use JSON_THROW
Jan 20, 2017
d566bb8
use switchs where appropriate
Jan 20, 2017
a6b0282
move conjunction/disjunction to the top of detail
Jan 20, 2017
889b269
rename template argument: BasicJson -> Json
Jan 20, 2017
708eb96
disable reserve tests when exceptions are disabled
Jan 21, 2017
7f35901
rename template argument Json -> BasicJsonType
Jan 21, 2017
40ba5a8
remove inline keyword from anonymous namespace (not needed)
Jan 21, 2017
f997758
remove useless forward declaration of primitive_iterator_t
Jan 21, 2017
7d771c7
put back type_name in basic_json
Jan 21, 2017
37fd20b
put uncvref_t, enable_if_t, value_t and operator<(value_t) in detail
Jan 21, 2017
ba0b35f
use typename U = uncvref_t where appropriate
Jan 21, 2017
9c6ef74
add static_asserts/remove the need for CopyConstructible in get
Jan 21, 2017
9f8b270
fix some warnings
Jan 22, 2017
9f103d1
add implicit conversions test (operator T())
Jan 22, 2017
3857e55
:lipstick: ran "make pretty"
nlohmann Jan 24, 2017
030cf67
:construction: fixed a warning
nlohmann Jan 24, 2017
250e5bf
:lipstick: overworked documentation and indentation
nlohmann Jan 24, 2017
daf8dcd
:memo: overworked README
nlohmann Jan 24, 2017
781fd09
:memo: cleanup
nlohmann Jan 24, 2017
50a3f3b
:memo: added nicer example
nlohmann Jan 24, 2017
c154f31
:construction: rephrased assertions
nlohmann Jan 24, 2017
4139bb6
:memo: adjusted test count
nlohmann Jan 24, 2017
ec03c9c
:memo: overworked docs #435
nlohmann Jan 25, 2017
94d9b7b
:memo: overworked documentation (re-added constructor examples)
nlohmann Jan 25, 2017
4d3053c
:lipstick: some cleanup
nlohmann Jan 25, 2017
77bb7af
:memo: added more documentation
nlohmann Jan 26, 2017
1305e03
:memo: fixed documentation
nlohmann Jan 26, 2017
cd9701b
:lipstick: cleanup
nlohmann Jan 26, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view