summaryrefslogtreecommitdiff
path: root/storage/connect/json.h
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2015-01-27 19:18:51 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2015-01-27 19:18:51 +0100
commitee5a4c8b33b1a0dda9ef7422730dbe32f6b384a9 (patch)
tree90d793031aaec843ea89c4b1014a6dc95301e6d9 /storage/connect/json.h
parente7802bff0e13fc420e3a3421f89a161618b32b0b (diff)
downloadmariadb-git-ee5a4c8b33b1a0dda9ef7422730dbe32f6b384a9.tar.gz
- Begin eliminating on Linux OverloadedVirtual warnings.
However some tests failed. Going to windows to try tracing them. modified: storage/connect/CMakeLists.txt storage/connect/array.h storage/connect/json.h storage/connect/tabdos.h storage/connect/tabjson.h storage/connect/taboccur.cpp storage/connect/tabpivot.h storage/connect/tabutil.h storage/connect/tabxcl.h storage/connect/valblk.h storage/connect/xindex.h
Diffstat (limited to 'storage/connect/json.h')
-rw-r--r--storage/connect/json.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/storage/connect/json.h b/storage/connect/json.h
index 11e15c3acd4..f0748108dd6 100644
--- a/storage/connect/json.h
+++ b/storage/connect/json.h
@@ -171,6 +171,8 @@ class JOBJECT : public JSON {
public:
JOBJECT(void) : JSON() {First = Last = NULL;}
+ using JSON::GetValue;
+ using JSON::SetValue;
virtual void Clear(void) {First = Last = NULL; Size = 0;}
virtual JTYP GetType(void) {return TYPE_JOB;}
virtual PJPR AddPair(PGLOBAL g, PSZ key);
@@ -192,6 +194,8 @@ class JARRAY : public JSON {
public:
JARRAY(void) : JSON() {Alloc = 0; First = Last = NULL; Mvals = NULL;}
+ using JSON::GetValue;
+ using JSON::SetValue;
virtual void Clear(void) {First = Last = NULL; Size = 0;}
virtual JTYP GetType(void) {return TYPE_JAR;}
virtual PJAR GetArray(void) {return this;}
@@ -223,6 +227,8 @@ class JVALUE : public JSON {
{Jsp = jsp; Value = NULL; Next = NULL; Del = false;}
JVALUE(PGLOBAL g, PVAL valp);
+ using JSON::GetValue;
+ using JSON::SetValue;
virtual void Clear(void)
{Jsp = NULL; Value = NULL; Next = NULL; Del = false; Size = 0;}
virtual JTYP GetType(void) {return TYPE_JVAL;}