j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Commit graph

  • 75a6888d55 [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 pf 2020-07-19 18:11:37 +0100
  • 8f14aaa13f [JSON] as per Nlohmann's suggestion, moved the macro builder code to third_party directory pf 2020-07-19 18:10:08 +0100
  • 851315c878 add regression test jprochazk 2020-07-19 18:35:58 +0200
  • f7374c9a8d Merge branch 'develop' of https://github.com/pfeatherstone/json into develop pf 2020-07-19 17:32:35 +0100
  • 0a158ee830 [JSON] rough and ready code for generating (de)serialisation macros. Current upper bound on number of member variables is set to 64 pf 2020-07-19 17:32:16 +0100
  • 21bd6e971b [JSON] - dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types - updated .gitignore file to ignore private netbeans project configurations pf 2020-07-18 16:13:56 +0100
  • 0b744e1ed0 [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 pf 2020-07-18 16:12:49 +0100
  • 8a045713ed [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 pf 2020-07-18 16:12:27 +0100
  • a575008c48 [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 pf 2020-07-18 16:11:34 +0100
  • 5eb739a585 [JSON] - dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types - netbeans project configurations pf 2020-07-18 16:10:32 +0100
  • 68122fe0ed [JSON] dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types pf 2020-07-18 16:08:29 +0100
  • b1da58b76b
         Merge pull request #2282 from nlohmann/missing_sax_check Niels Lohmann 2020-07-19 18:09:08 +0200
  • 1fd6c5882a
         Merge pull request #2285 from T0b1-iOS/develop Niels Lohmann 2020-07-19 17:55:51 +0200
  • d371a5283c run amalgamate jprochazk 2020-07-19 10:57:17 +0200
  • ab25de05f7 fix: return -> result.push_back jprochazk 2020-07-19 10:51:13 +0200
  • a3a9d5665e add break to binary_reader::get_binary and get_string jprochazk 2020-07-19 09:35:49 +0200
  • 0d2d088b97 [JSON] - dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types - updated .gitignore file to ignore private netbeans project configurations pf 2020-07-18 16:13:56 +0100
  • c122d8a94f [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 pf 2020-07-18 16:12:49 +0100
  • 4706d6e976 [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 pf 2020-07-18 16:12:27 +0100
  • 9afe757648 [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 pf 2020-07-18 16:11:34 +0100
  • 8730af0788 [JSON] - dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types - netbeans project configurations pf 2020-07-18 16:10:32 +0100
  • beb1fb48f0 [JSON] dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types pf 2020-07-18 16:08:29 +0100
  • 88243b3f8c
         run amalgamate T0b1-iOS 2020-07-18 07:09:56 +0200
  • 281349d0d6
         add inline specifier for detail::combine T0b1-iOS 2020-07-18 06:28:11 +0200
  • 43ab8a2357
         Merge pull request #2279 from nlohmann/issue1818 Niels Lohmann 2020-07-18 06:12:57 +0200
  • 7fc4b2901a
         🚸 add static assertion for missing binary function in SAX interface Niels Lohmann 2020-07-17 20:41:11 +0200
  • 2fd57d3ed1
         ✅ add test for target_include_directories #1818 Niels Lohmann 2020-07-17 14:26:22 +0200
  • a10d486e36
         Merge pull request #2244 from matthewbauer/tag-cbor Niels Lohmann 2020-07-17 14:05:48 +0200
  • e65cc9dccb
         Merge pull request #2274 from nlohmann/analyzers Niels Lohmann 2020-07-17 14:01:19 +0200
  • 548e7e54c9
         Merge pull request #2273 from nlohmann/issue1968 Niels Lohmann 2020-07-17 13:59:55 +0200
  • 6023a7ccd9
         Merge branch 'develop' into analyzers Niels Lohmann 2020-07-17 13:59:32 +0200
  • 270f1ae482
         Merge pull request #2269 from nlohmann/hash Niels Lohmann 2020-07-17 13:57:47 +0200
  • d047b3d495
         🚨 remove linter warning Niels Lohmann 2020-07-16 14:45:39 +0200
  • 26196f25f6
         🔥 remove test Makefile targets (all handled by CMake) Niels Lohmann 2020-07-16 13:38:25 +0200
  • 3d60befde3
         🔧 adjust analysis targets Niels Lohmann 2020-07-16 12:14:06 +0200
  • 7f6ea47bdb
         🔧 adjust analysis targets Niels Lohmann 2020-07-16 09:44:07 +0200
  • 4c59d6aaef
         🔥 remove leftover Niels Lohmann 2020-07-16 09:43:35 +0200
  • 23c97f4aa5
         Merge pull request #2268 from t-b/feature/add-clang-cl Niels Lohmann 2020-07-16 07:40:58 +0200
  • 93cdf05928
         ✅ add tests Niels Lohmann 2020-07-15 14:23:22 +0200
  • 01e196f6b6
         Merge branch 'develop' of https://github.com/nlohmann/json into issue1968 Niels Lohmann 2020-07-15 13:50:00 +0200
  • b821ed074f
         💡 add documentation Niels Lohmann 2020-07-15 13:45:16 +0200
  • 496ddd127c
         💚 make test deterministic Niels Lohmann 2020-07-15 12:14:30 +0200
  • 9449dfcc6a
         💚 add test cases for hash Niels Lohmann 2020-07-15 09:27:01 +0200
  • 25a59b59f2 Github Actions: Add ClangCL on Windows Thomas Braun 2020-07-14 14:15:24 +0200
  • 6d7f8b3793 README.md: Remove trailing whitespace Thomas Braun 2020-07-14 15:36:06 +0200
  • 33b0bed7fe
         💚 fix compilation Niels Lohmann 2020-07-14 14:34:55 +0200
  • 5b229f4cce
         ⚡ hash function without allocation Niels Lohmann 2020-07-14 14:31:19 +0200
  • 1a521cbd36
         Merge pull request #2264 from t-b/feature/use-proper-SED-in-makefile Niels Lohmann 2020-07-14 14:07:33 +0200
  • 8921e5e5db
         Merge pull request #2262 from nlohmann/more_ci Niels Lohmann 2020-07-13 21:04:57 +0200
  • 88adffdaba Makefile: Always use SED variable Thomas Braun 2020-07-13 14:44:40 +0200
  • 938b867450
         📝 add Xcode 12 to CI list Niels Lohmann 2020-07-12 21:45:00 +0200
  • 3952739189
         ✨ add CBOR tag handler #1968 Niels Lohmann 2020-07-12 16:51:43 +0200
  • a244531627
         ♻️ overwork Travis YAML Niels Lohmann 2020-07-12 15:33:16 +0200
  • cf741313b3
         📝 add Clang on Windows to CI list Niels Lohmann 2020-07-12 15:31:17 +0200
  • e316f5c5b6
         Merge pull request #2258 from nlohmann/issue2179 Niels Lohmann 2020-07-12 13:11:23 +0200
  • 486812904f
         Merge pull request #2259 from nlohmann/clang_windows Niels Lohmann 2020-07-12 13:09:35 +0200
  • 4d28694756
         ♻️ replace further alternative operators Niels Lohmann 2020-07-11 19:28:58 +0200
  • 738c83d6af
         💚 add test for ordered_map Niels Lohmann 2020-07-11 19:24:32 +0200
  • 8d295235a5
         🔥 remove unused boolean_operators.hpp header Niels Lohmann 2020-07-11 19:20:44 +0200
  • 6477b9b20a
         ♻️ replace further alternative operators Niels Lohmann 2020-07-11 14:09:06 +0200
  • 7f923424b3
         🔀 merge develop branch and resolve conflicts Niels Lohmann 2020-07-11 14:05:02 +0200
  • dc06f100be
         Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows Niels Lohmann 2020-07-11 14:04:40 +0200
  • 889f269a6c
         ♻️ replace further alternative operators Niels Lohmann 2020-07-11 13:51:25 +0200
  • b2240f7508
         🏁 remove failing code for Clang/Windows Niels Lohmann 2020-07-11 13:46:04 +0200
  • 609a0046c4
         ♻️ replace further alternative operators Niels Lohmann 2020-07-11 13:39:14 +0200
  • 3a80823ff8
         🔀 merge develop branch and resolve conflicts Niels Lohmann 2020-07-11 13:21:13 +0200
  • 9c21285133
         Merge branch 'develop' of https://github.com/nlohmann/json into issue2179 Niels Lohmann 2020-07-11 13:20:16 +0200
  • 5f146cb853
         Merge pull request #2206 from gatopeich/issue2179 Niels Lohmann 2020-07-11 13:15:40 +0200
  • 47d154dd49
         Remove redundant comment gatopeich 2020-07-11 00:34:12 +0100
  • f9a1fec272
         Remove redundant comment gatopeich 2020-07-11 00:34:02 +0100
  • cbafed3494
         ⬇️ require CMake 3.1 Niels Lohmann 2020-07-10 12:53:48 +0200
  • f62b4626be Removing comment about AllocatorType per review request gatopeich 2020-07-09 21:12:11 +0100
  • 0eb7b0a991
         Update README.md per review comments gatopeich 2020-07-09 20:47:19 +0100
  • 75d5d05993
         Merge pull request #2253 from ericonr/pkgconf Niels Lohmann 2020-07-09 20:42:42 +0200
  • 4c7bd014d9
         Merge pull request #2242 from nlohmann/issue2239 Niels Lohmann 2020-07-09 15:13:12 +0200
  • d740622f96
         📝 add documentation for macros Niels Lohmann 2020-07-09 13:23:33 +0200
  • 251fce819c README: add explanation on how to use pkg-config. Érico Rolim 2020-07-08 17:10:51 -0300
  • c7d18c1625 cmake: Generate and install a pkg-config file. Palmer Dabbelt 2019-08-08 14:36:27 -0700
  • 0306525cdb
         Merge pull request #2251 from nlohmann/fix_2181 Niels Lohmann 2020-07-09 07:33:03 +0200
  • f774a32d2b
         ✅ fix test Niels Lohmann 2020-07-08 14:47:22 +0200
  • e3e9ccfc02
         🚑 fix regression from #2181 Niels Lohmann 2020-07-08 14:02:28 +0200
  • 1b04092c5c
         ✅ fix test Niels Lohmann 2020-07-08 12:38:46 +0200
  • d019ddfcdb
         👷 add code scanning Niels Lohmann 2020-07-08 12:25:53 +0200
  • dd08f7705f Add simple test for cbor byte Matthew Bauer 2020-07-06 18:06:10 -0400
  • 28ef87370b
         🚨 fix warning Niels Lohmann 2020-07-06 13:19:06 +0200
  • 99fc6b16ab
         Merge branch 'develop' of https://github.com/nlohmann/json into issue2239 Niels Lohmann 2020-07-06 12:52:59 +0200
  • ba8174041e
         ✅ add test case for JSON_ASSERT Niels Lohmann 2020-07-06 12:52:48 +0200
  • efcc826ecb
         🚨 fix warning Niels Lohmann 2020-07-06 12:37:39 +0200
  • 98b1c6d302
         🚩 use JSON_ASSERT(x) instead of assert(x) Niels Lohmann 2020-07-06 12:22:31 +0200
  • b04dc055b2
         Merge pull request #2233 from nlohmann/issue2175 Niels Lohmann 2020-07-06 07:58:52 +0200
  • 197c3d4fb0
         Merge pull request #2232 from nlohmann/ignore_documentation Niels Lohmann 2020-07-06 07:58:28 +0200
  • 803c16e5af Clean-up unintended changes to whitespace Agustín F. Pozuelo 2020-07-03 10:26:05 +0100
  • 25f5d75e6e Fix compilation for xcode 9.x Agustín F. Pozuelo 2020-07-03 01:44:18 +0100
  • 93770467a1 Precisely 4 template arguments for the sake of clang 3.6 (?) Agustín F. Pozuelo 2020-07-03 01:28:54 +0100
  • 0fc261f0f2 Make ordered_map compatible with GCC 5.5 Agustín F. Pozuelo 2020-07-03 00:33:31 +0100
  • e54f03f73b Tag binary values in cbor if set Matthew Bauer 2020-07-02 17:40:02 -0400
  • f59f4a2b61
         💚 fix build Niels Lohmann 2020-06-30 19:55:40 +0200
  • c7e079cc98
         🚑 add specialization of get_to #2175 Niels Lohmann 2020-06-30 14:26:52 +0200
  • ad6eadeb70
         📝 refine documentation of error_handler parameter Niels Lohmann 2020-06-30 13:59:43 +0200
  • 49f26a0250 Have 4 template parameters for ordered_map gatopeich 2020-06-29 17:32:55 +0100