From 330b48b94b53bcbbc490f952d6798d5ab637721a Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Fri, 30 Sep 2016 12:00:00 -0400
Subject: [PATCH] Separate enum from struct
Otherwise the enum symbols are not visible outside the struct in C++.
Reviewed-by: Thomas Munro <thomas.munro@enterprisedb.com>
---
src/include/utils/jsonb.h | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/include/utils/jsonb.h b/src/include/utils/jsonb.h
index fa52afcb5c3..48ca9dc913c 100644
--- a/src/include/utils/jsonb.h
+++ b/src/include/utils/jsonb.h
@@ -219,6 +219,20 @@ typedef struct
#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
* deserialized representation, that can easily support using the "val"
@@ -227,19 +241,7 @@ typedef struct
*/
struct JsonbValue
{
- enum
- {
- /* Scalar types */
- jbvNull = 0x0,
- jbvString,
- jbvNumeric,
- jbvBool,
- /* Composite types */
- jbvArray = 0x10,
- jbvObject,
- /* Binary (i.e. struct Jsonb) jbvArray/jbvObject */
- jbvBinary
- } type; /* Influences sort order */
+ jbvType type; /* Influences sort order */
union
{
--
GitLab