Commit 330b48b9 authored by Peter Eisentraut's avatar Peter Eisentraut

Separate enum from struct

Otherwise the enum symbols are not visible outside the struct in C++.
Reviewed-by: default avatarThomas Munro <thomas.munro@enterprisedb.com>
parent 0665023b
...@@ -219,6 +219,20 @@ typedef struct ...@@ -219,6 +219,20 @@ typedef struct
#define JB_ROOT_IS_ARRAY(jbp_) ( *(uint32*) VARDATA(jbp_) & JB_FARRAY) #define JB_ROOT_IS_ARRAY(jbp_) ( *(uint32*) VARDATA(jbp_) & JB_FARRAY)
enum jbvType
{
/* Scalar types */
jbvNull = 0x0,
jbvString,
jbvNumeric,
jbvBool,
/* Composite types */
jbvArray = 0x10,
jbvObject,
/* Binary (i.e. struct Jsonb) jbvArray/jbvObject */
jbvBinary
};
/* /*
* JsonbValue: In-memory representation of Jsonb. This is a convenient * JsonbValue: In-memory representation of Jsonb. This is a convenient
* deserialized representation, that can easily support using the "val" * deserialized representation, that can easily support using the "val"
...@@ -227,19 +241,7 @@ typedef struct ...@@ -227,19 +241,7 @@ typedef struct
*/ */
struct JsonbValue struct JsonbValue
{ {
enum jbvType type; /* Influences sort order */
{
/* Scalar types */
jbvNull = 0x0,
jbvString,
jbvNumeric,
jbvBool,
/* Composite types */
jbvArray = 0x10,
jbvObject,
/* Binary (i.e. struct Jsonb) jbvArray/jbvObject */
jbvBinary
} type; /* Influences sort order */
union union
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment