Merge remote-tracking branch 'upstream/stable' into merge_stable

This commit is contained in:
Martin Nowak 2019-12-14 23:22:18 +01:00
commit 1589503ca0

View file

@ -95,18 +95,22 @@ enum JSONType : byte
object, /// ditto object, /// ditto
true_, /// ditto true_, /// ditto
false_, /// ditto false_, /// ditto
deprecated("Use .null_") NULL = null_, // FIXME: Find some way to deprecate the enum members below, which does NOT
deprecated("Use .string") STRING = string, // create lots of spam-like deprecation warnings, which can't be fixed
deprecated("Use .integer") INTEGER = integer, // by the user. See discussion on this issue at
deprecated("Use .uinteger") UINTEGER = uinteger, // https://forum.dlang.org/post/feudrhtxkaxxscwhhhff@forum.dlang.org
deprecated("Use .float_") FLOAT = float_, /* deprecated("Use .null_") */ NULL = null_,
deprecated("Use .array") ARRAY = array, /* deprecated("Use .string") */ STRING = string,
deprecated("Use .object") OBJECT = object, /* deprecated("Use .integer") */ INTEGER = integer,
deprecated("Use .true_") TRUE = true_, /* deprecated("Use .uinteger") */ UINTEGER = uinteger,
deprecated("Use .false_") FALSE = false_, /* deprecated("Use .float_") */ FLOAT = float_,
/* deprecated("Use .array") */ ARRAY = array,
/* deprecated("Use .object") */ OBJECT = object,
/* deprecated("Use .true_") */ TRUE = true_,
/* deprecated("Use .false_") */ FALSE = false_,
} }
deprecated("Use JSONType") alias JSON_TYPE = JSONType; deprecated("Use JSONType and the new enum member names") alias JSON_TYPE = JSONType;
/** /**
JSON value node JSON value node