Code

Feature/user defined types bis#355

Code

Closed

theodelrieu wants to merge 40 commits intonlohmann:developnlohmann/json:developfrom theodelrieu:feature/user_defined_types_bistheodelrieu/json:feature/user_defined_types_bisCopy head branch name to clipboard

+1,227-224

Commits

Commits on Nov 26, 2016

• add first version support for user-defined types

  

  Théo Delrieu

  authored and

  Theo

  committed
  ca811a2

  Copy full SHA for ca811a2

• fix compilation on gcc-6

  

  theodelrieu

  authored and

  Theo

  committed
  8da5ad5

  Copy full SHA for 8da5ad5

• anonymous namespace renamed to detail

  

  theodelrieu

  authored and

  Theo

  committed
  528315f

  Copy full SHA for 528315f

• wip: add free function to_json/from_json support

  

  theodelrieu

  authored and

  Theo

  committed
  d6fea62

  Copy full SHA for d6fea62

• wip: modify from_json prototype

  

  Théo DELRIEU

  authored and

  Theo

  committed
  2bb49e1

  Copy full SHA for 2bb49e1

• wip: add get_impl overload that uses free from_json method

  

  Théo DELRIEU

  authored and

  Theo

  committed
  3bbccb1

  Copy full SHA for 3bbccb1

• add alias templates to reduce boilerplate

  

  theodelrieu

  authored and

  Theo

  committed
  eb58a4e

  Copy full SHA for eb58a4e

• revert useless formatting

  

  Théo DELRIEU

  authored and

  Theo

  committed
  d2f8d43

  Copy full SHA for d2f8d43

• rename __static_const to _static_const (reserved identifier)

  

  Théo DELRIEU

  authored and

  Theo

  committed
  34c9f09

  Copy full SHA for 34c9f09

• use uncvref_t<T> instead of remove_cv_t<remove_reference_t<T>>>

  

  Théo DELRIEU

  authored and

  Theo

  committed
  27d4416

  Copy full SHA for 27d4416

• remove has_destructor and has_json_traits, use decltype instead

  

  Théo DELRIEU

  authored and

  Theo

  committed
  93dabed

  Copy full SHA for 93dabed

• move most SFINAE trickery in to/from_json_fn

  

  Théo DELRIEU

  authored and

  Theo

  committed
  d36ae18

  Copy full SHA for d36ae18

• fix compilation on vs2015 (taken from MS-ranges)

  

  Théo Delrieu

  authored and

  Theo

  committed
  e90553f

  Copy full SHA for e90553f

• fix compilation on gcc 4.9

  

  theodelrieu

  authored and

  Theo

  committed
  0ec64b6

  Copy full SHA for 0ec64b6

• add first version for alternate implementation

  

  theodelrieu

  authored and

  Theo

  committed
  7d6dbcf

  Copy full SHA for 7d6dbcf

• add template arguments for JSONSerializer

  

  Théo DELRIEU

  authored and

  Theo

  committed
  d45533b

  Copy full SHA for d45533b

• renamed unit-constructor3.cpp to unit-udt.cpp

  

  Théo DELRIEU

  authored and

  Theo

  committed
  7dbafbe

  Copy full SHA for 7dbafbe

• to_json and from_json takes both two arguments now

  Show description for 75a9cf1
  

  theodelrieu

  authored and

  Theo

  committed
  75a9cf1

  Copy full SHA for 75a9cf1

• fix compilation: add a return in constexpr functions

  

  Théo DELRIEU

  authored and

  Theo

  committed
  88f7eb6

  Copy full SHA for 88f7eb6

• add basic test for custom serializer

  

  Théo DELRIEU

  authored and

  Theo

  committed
  a5d81ff

  Copy full SHA for a5d81ff

• add is_compatible_* traits

  

  theodelrieu

  authored and

  Theo

  committed
  b1e4717

  Copy full SHA for b1e4717

• remove constraints on JSONSerializer instances, constrain correctly new methods

  

  theodelrieu

  authored and

  Theo

  committed
  c41e03b

  Copy full SHA for c41e03b

• add negation, disjunction, and conjunction from C++17

  

  theodelrieu

  authored and

  Theo

  committed
  c8102d2

  Copy full SHA for c8102d2

• correctly constrain basic_json udt constructor

  

  Théo DELRIEU

  authored and

  Theo

  committed
  b97eb4d

  Copy full SHA for b97eb4d

• add a macro for has_xxx types

  

  Théo Delrieu

  authored and

  Theo

  committed
  8424215

  Copy full SHA for 8424215

• add is_compatible_basic_json_type trait

  

  Théo DELRIEU

  authored and

  Theo

  committed
  ec5ba4c

  Copy full SHA for ec5ba4c

• only use conjunction & co when needed to avoid MSVC crashing

  

  Théo Delrieu

  authored and

  Theo

  committed
  58b145f

  Copy full SHA for 58b145f

• format biggest lines

  

  theodelrieu

  authored and

  Theo

  committed
  453fe5d

  Copy full SHA for 453fe5d

• remove some useless checks, format a bit, added some comments

  

  Théo Delrieu

  authored and

  Theo

  committed
  cd82e8e

  Copy full SHA for cd82e8e

• add a few tests

  

  theodelrieu

  authored and

  Theo

  committed
  4e0ac59

  Copy full SHA for 4e0ac59

Commits on Nov 30, 2016

• add support for non-default-constructible udt

  

  Théo DELRIEU

  authored and

  Theo

  committed
  a645a76

  Copy full SHA for a645a76

Commits on Dec 4, 2016

• rewrite unit-udt: basic usage

  

  Théo Delrieu

  authored and

  theodelrieu

  committed
  dabe99f

  Copy full SHA for dabe99f

• remove explicit keyword on udt-constructor

  theodelrieu

  committed
  4c1e846

  Copy full SHA for 4c1e846

Commits on Dec 7, 2016

• add an enum constructor (quickfix)

  theodelrieu

  committed
  17ce87d

  Copy full SHA for 17ce87d

Commits on Dec 13, 2016

• add more tests to unit-udt.cpp

  theodelrieu

  committed
  f9e02e9

  Copy full SHA for f9e02e9

• add support for enum classes

  theodelrieu

  committed
  13082c1

  Copy full SHA for 13082c1

Commits on Dec 14, 2016

• fix msvc, by doubling parenthesis on catch assertions

  theodelrieu

  committed
  b6ef4f7

  Copy full SHA for b6ef4f7

• use u8 prefix in unit-udt.cpp

  theodelrieu

  committed
  301af87

  Copy full SHA for 301af87

• add more tests

  theodelrieu

  committed
  35682b4

  Copy full SHA for 35682b4

Commits on Dec 15, 2016

• fix tests, avoid instantiating JSONSerializer when it will not be used

  

  Théo DELRIEU

  committed
  59ffbab

  Copy full SHA for 59ffbab