Commits · 8159091d8f2d163470d2a8d69f8e95dbf75f1708 · Libraries / json

23 Jul, 2020 3 commits
- 🔀 rename variable to avoid shadowing · 8159091d
  Niels Lohmann authored Jul 23, 2020
  
  8159091d
- 🚨 add prefix to avoid shadowing · 230dcfb7
  Niels Lohmann authored Jul 23, 2020
  
  230dcfb7
- Merge pull request #1559 from theodelrieu/feat/explicit_conversion_operator · a048b72f
  Niels Lohmann authored Jul 23, 2020
```
Feat/explicit conversion operator
```
  a048b72f
22 Jul, 2020 5 commits
- Merge pull request #2299 from nlohmann/fix_warnings · 484029b5
  Niels Lohmann authored Jul 22, 2020
```
Fix unused parameter
```
  484029b5
- add a CI job for explicit conversions on every os · 79732931
  Théo DELRIEU authored Jul 16, 2020
  
  79732931
- add a switch to enable implicit conversions (defaults to true) · 74b446f5
  Théo DELRIEU authored Jul 16, 2020
```
wrap implicit conversions tests around the JSON_USE_IMPLICIT_CONVERSIONS
macro
```
  74b446f5
- Merge pull request #2300 from nlohmann/gihub_actions · 2cd10a74
  Niels Lohmann authored Jul 22, 2020
```
Merge Gitlab actions
```
  2cd10a74
- 👷 merge Gitlab actions · 6bd38a2c
  Niels Lohmann authored Jul 22, 2020
  
  6bd38a2c
21 Jul, 2020 1 commit
- 🚨 fix warnings · 8b14c9b3
  Niels Lohmann authored Jul 21, 2020
  
  8b14c9b3
20 Jul, 2020 4 commits
- Merge pull request #2287 from pfeatherstone/develop · 83448577
  Niels Lohmann authored Jul 20, 2020
```
Serialisation macros: increase upper bound on number of member variables
```
  83448577
- [JSON] initialise all member variables. Maybe this will shut valgrind up.... · 35b899e9
  pf authored Jul 20, 2020
```
[JSON] initialise all member variables. Maybe this will shut valgrind up. std::tie probably wasn't the problem initially
```
  35b899e9
- [JSON] drop use of std::tie and std::tupe for operator== overload. valgrind and clang < 4 complain · 7660ea12
  pf authored Jul 20, 2020
  
  7660ea12
- Merge pull request #2294 from jprochazk/develop · 893eda83
  Niels Lohmann authored Jul 20, 2020
```
fix eof for get_binary and get_string
```
  893eda83
19 Jul, 2020 21 commits
- [JSON] don't know why CHECK doesn't like "CHECK(obj1 == obj2)". So using a temporary bool. · 678d310b
  pf authored Jul 19, 2020
  
  678d310b
- [JSON] use CHECK from doctest · e83ddb18
  pf authored Jul 19, 2020
  
  e83ddb18
- [JSON] CHECK in doctest only accepts std::string ? Use assert statement instead. Does the job · 254f0e3c
  pf authored Jul 19, 2020
  
  254f0e3c
- [JSON] doctest: need another section ? · 578217ea
  pf authored Jul 19, 2020
  
  578217ea
- [JSON] as per Nlohmann's suggestion, added unit tests for the (de)serialisation macros · 6d9b2040
  pf authored Jul 19, 2020
  
  6d9b2040
- [JSON] since we no longer use a netbeans project for the (de)serialisation... · 75a6888d
  pf authored Jul 19, 2020
```
[JSON] since we no longer use a netbeans project for the (de)serialisation macro building code, can revert the changes made to the .gitignore file
```
  75a6888d
- [JSON] as per Nlohmann's suggestion, moved the macro builder code to third_party directory · 8f14aaa1
  pf authored Jul 19, 2020
  
  8f14aaa1
- add regression test · 851315c8
  jprochazk authored Jul 19, 2020
  
  851315c8
- Merge branch 'develop' of https://github.com/pfeatherstone/json into develop · f7374c9a
  pf authored Jul 19, 2020
  
  f7374c9a
- [JSON] rough and ready code for generating (de)serialisation macros. Current... · 0a158ee8
  pf authored Jul 19, 2020
```
[JSON] rough and ready code for generating (de)serialisation macros. Current upper bound on number of member variables is set to 64
```
  0a158ee8
- [JSON] - dirty code for building intrusive and non-intrusive... · 21bd6e97
  pf authored Jul 18, 2020
```
[JSON] 	- dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types
		- updated .gitignore file to ignore private netbeans project configurations
```
  21bd6e97
- [JSON] - dirty code for building intrusive and non-intrusive... · 0b744e1e
  pf authored Jul 18, 2020
```
[JSON] 	- dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types
		- used code to increase the upper bound on number of member variables to 64
```
  0b744e1e
- [JSON] - dirty code for building intrusive and non-intrusive... · 8a045713
  pf authored Jul 18, 2020
```
[JSON] 	- dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types
		- used code to increase the upper bound on number of member variables to 64
```
  8a045713
- [JSON] - dirty code for building intrusive and non-intrusive... · a575008c
  pf authored Jul 18, 2020
```
[JSON] 	- dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types
		- updated .gitignore file to ignore "dist" and "build" directories in netbeans project 
```
  a575008c
- [JSON] - dirty code for building intrusive and non-intrusive... · 5eb739a5
  pf authored Jul 18, 2020
```
[JSON] 	- dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types
		- netbeans project configurations
```
  5eb739a5
- [JSON] dirty code for building intrusive and non-intrusive... · 68122fe0
  pf authored Jul 18, 2020
```
[JSON] dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types
```
  68122fe0
- Merge pull request #2282 from nlohmann/missing_sax_check · b1da58b7
  Niels Lohmann authored Jul 19, 2020
```
Add static assertion for missing binary function in SAX interface
```
  b1da58b7
- Merge pull request #2285 from T0b1-iOS/develop · 1fd6c588
  Niels Lohmann authored Jul 19, 2020
```
add inline specifier for detail::combine
```
  1fd6c588
- run amalgamate · d371a528
  jprochazk authored Jul 19, 2020
  
  d371a528
- fix: return -> result.push_back · ab25de05
  jprochazk authored Jul 19, 2020
  
  ab25de05
- add break to binary_reader::get_binary and get_string · a3a9d566
  jprochazk authored Jul 19, 2020
  
  a3a9d566
18 Jul, 2020 6 commits

[JSON] - dirty code for building intrusive and non-intrusive... · 0d2d088b

pf authored Jul 18, 2020

[JSON] 	- dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types
		- updated .gitignore file to ignore private netbeans project configurations

0d2d088b

[JSON] - dirty code for building intrusive and non-intrusive... · c122d8a9

pf authored Jul 18, 2020

[JSON] 	- dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types
		- used code to increase the upper bound on number of member variables to 64

c122d8a9

[JSON] - dirty code for building intrusive and non-intrusive... · 4706d6e9

pf authored Jul 18, 2020

[JSON] 	- dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types
		- used code to increase the upper bound on number of member variables to 64

4706d6e9

[JSON] - dirty code for building intrusive and non-intrusive... · 9afe7576

pf authored Jul 18, 2020

[JSON] 	- dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types
		- updated .gitignore file to ignore "dist" and "build" directories in netbeans project

9afe7576

[JSON] - dirty code for building intrusive and non-intrusive... · 8730af07

pf authored Jul 18, 2020

[JSON] 	- dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types
		- netbeans project configurations

8730af07

[JSON] dirty code for building intrusive and non-intrusive... · beb1fb48

pf authored Jul 18, 2020

[JSON] dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types

beb1fb48