mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
- 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
This commit is contained in:
parent
e7802bff0e
commit
ee5a4c8b33
11 changed files with 23 additions and 5 deletions
|
@ -50,7 +50,7 @@ IF(UNIX)
|
||||||
add_definitions(-Wall -Wextra -Wmissing-declarations)
|
add_definitions(-Wall -Wextra -Wmissing-declarations)
|
||||||
message(STATUS "CONNECT: GCC: All warnings enabled")
|
message(STATUS "CONNECT: GCC: All warnings enabled")
|
||||||
else()
|
else()
|
||||||
add_definitions(-Wall -Wmissing-declarations)
|
add_definitions(-Wall -Wmissing-declarations -Woverloaded-virtual)
|
||||||
add_definitions(-Wno-write-strings)
|
add_definitions(-Wno-write-strings)
|
||||||
add_definitions(-Wno-unused-variable)
|
add_definitions(-Wno-unused-variable)
|
||||||
# Bar: -Wno-unused-but-set-variables commented (does not present on sol10)
|
# Bar: -Wno-unused-but-set-variables commented (does not present on sol10)
|
||||||
|
|
|
@ -50,6 +50,7 @@ class DllExport ARRAY : public XOBJECT, public CSORT { // Array descblock
|
||||||
// void SetCorrel(bool b) {Correlated = b;}
|
// void SetCorrel(bool b) {Correlated = b;}
|
||||||
|
|
||||||
// Methods
|
// Methods
|
||||||
|
using XOBJECT::GetIntValue;
|
||||||
virtual void Reset(void) {Bot = -1;}
|
virtual void Reset(void) {Bot = -1;}
|
||||||
virtual int Qcompare(int *, int *);
|
virtual int Qcompare(int *, int *);
|
||||||
virtual bool Compare(PXOB) {assert(FALSE); return FALSE;}
|
virtual bool Compare(PXOB) {assert(FALSE); return FALSE;}
|
||||||
|
|
|
@ -171,6 +171,8 @@ class JOBJECT : public JSON {
|
||||||
public:
|
public:
|
||||||
JOBJECT(void) : JSON() {First = Last = NULL;}
|
JOBJECT(void) : JSON() {First = Last = NULL;}
|
||||||
|
|
||||||
|
using JSON::GetValue;
|
||||||
|
using JSON::SetValue;
|
||||||
virtual void Clear(void) {First = Last = NULL; Size = 0;}
|
virtual void Clear(void) {First = Last = NULL; Size = 0;}
|
||||||
virtual JTYP GetType(void) {return TYPE_JOB;}
|
virtual JTYP GetType(void) {return TYPE_JOB;}
|
||||||
virtual PJPR AddPair(PGLOBAL g, PSZ key);
|
virtual PJPR AddPair(PGLOBAL g, PSZ key);
|
||||||
|
@ -192,6 +194,8 @@ class JARRAY : public JSON {
|
||||||
public:
|
public:
|
||||||
JARRAY(void) : JSON() {Alloc = 0; First = Last = NULL; Mvals = NULL;}
|
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 void Clear(void) {First = Last = NULL; Size = 0;}
|
||||||
virtual JTYP GetType(void) {return TYPE_JAR;}
|
virtual JTYP GetType(void) {return TYPE_JAR;}
|
||||||
virtual PJAR GetArray(void) {return this;}
|
virtual PJAR GetArray(void) {return this;}
|
||||||
|
@ -223,6 +227,8 @@ class JVALUE : public JSON {
|
||||||
{Jsp = jsp; Value = NULL; Next = NULL; Del = false;}
|
{Jsp = jsp; Value = NULL; Next = NULL; Del = false;}
|
||||||
JVALUE(PGLOBAL g, PVAL valp);
|
JVALUE(PGLOBAL g, PVAL valp);
|
||||||
|
|
||||||
|
using JSON::GetValue;
|
||||||
|
using JSON::SetValue;
|
||||||
virtual void Clear(void)
|
virtual void Clear(void)
|
||||||
{Jsp = NULL; Value = NULL; Next = NULL; Del = false; Size = 0;}
|
{Jsp = NULL; Value = NULL; Next = NULL; Del = false; Size = 0;}
|
||||||
virtual JTYP GetType(void) {return TYPE_JVAL;}
|
virtual JTYP GetType(void) {return TYPE_JVAL;}
|
||||||
|
|
|
@ -222,6 +222,7 @@ class DllExport DOSCOL : public COLBLK {
|
||||||
virtual PVBLK GetDval(void) {return Dval;}
|
virtual PVBLK GetDval(void) {return Dval;}
|
||||||
|
|
||||||
// Methods
|
// Methods
|
||||||
|
using COLBLK::Print;
|
||||||
virtual bool VarSize(void);
|
virtual bool VarSize(void);
|
||||||
virtual bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);
|
virtual bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);
|
||||||
virtual void ReadColumn(PGLOBAL g);
|
virtual void ReadColumn(PGLOBAL g);
|
||||||
|
|
|
@ -77,7 +77,7 @@ class TDBJSN : public TDBDOS {
|
||||||
virtual PTDB CopyOne(PTABS t);
|
virtual PTDB CopyOne(PTABS t);
|
||||||
virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
|
virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
|
||||||
virtual PCOL InsertSpecialColumn(PGLOBAL g, PCOL colp);
|
virtual PCOL InsertSpecialColumn(PGLOBAL g, PCOL colp);
|
||||||
virtual int RowNumber(PGLOBAL g, BOOL b = FALSE)
|
virtual int RowNumber(PGLOBAL g, bool b = FALSE)
|
||||||
{return (b) ? N : Fpos + 1;}
|
{return (b) ? N : Fpos + 1;}
|
||||||
|
|
||||||
// Database routines
|
// Database routines
|
||||||
|
|
|
@ -355,7 +355,7 @@ bool TDBOCCUR::MakeColumnList(PGLOBAL g)
|
||||||
|
|
||||||
for (colp = Columns; colp; colp = colp->GetNext())
|
for (colp = Columns; colp; colp = colp->GetNext())
|
||||||
if (colp->GetAmType() == TYPE_AM_PRX)
|
if (colp->GetAmType() == TYPE_AM_PRX)
|
||||||
if (((PPRXCOL)colp)->Init(g))
|
if (((PPRXCOL)colp)->Init(g, NULL))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
Col = (PCOL*)PlugSubAlloc(g, NULL, Mult * sizeof(PCOL));
|
Col = (PCOL*)PlugSubAlloc(g, NULL, Mult * sizeof(PCOL));
|
||||||
|
|
|
@ -180,9 +180,10 @@ class SRCCOL : public PRXCOL {
|
||||||
virtual int GetAmType(void) {return TYPE_AM_SRC;}
|
virtual int GetAmType(void) {return TYPE_AM_SRC;}
|
||||||
|
|
||||||
// Methods
|
// Methods
|
||||||
|
using PRXCOL::Init;
|
||||||
virtual void Reset(void) {}
|
virtual void Reset(void) {}
|
||||||
void SetColumn(void);
|
void SetColumn(void);
|
||||||
bool Init(PGLOBAL g);
|
virtual bool Init(PGLOBAL g);
|
||||||
bool CompareLast(void);
|
bool CompareLast(void);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
|
@ -108,13 +108,14 @@ class DllExport PRXCOL : public COLBLK {
|
||||||
virtual int GetAmType(void) {return TYPE_AM_PRX;}
|
virtual int GetAmType(void) {return TYPE_AM_PRX;}
|
||||||
|
|
||||||
// Methods
|
// Methods
|
||||||
|
using COLBLK::Init;
|
||||||
virtual void Reset(void);
|
virtual void Reset(void);
|
||||||
virtual bool IsSpecial(void) {return Pseudo;}
|
virtual bool IsSpecial(void) {return Pseudo;}
|
||||||
virtual bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check)
|
virtual bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check)
|
||||||
{return false;}
|
{return false;}
|
||||||
virtual void ReadColumn(PGLOBAL g);
|
virtual void ReadColumn(PGLOBAL g);
|
||||||
virtual void WriteColumn(PGLOBAL g);
|
virtual void WriteColumn(PGLOBAL g);
|
||||||
virtual bool Init(PGLOBAL g, PTDBASE tp = NULL);
|
virtual bool Init(PGLOBAL g, PTDBASE tp);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
// Default constructor not to be used
|
// Default constructor not to be used
|
||||||
|
|
|
@ -88,6 +88,7 @@ class XCLCOL : public PRXCOL {
|
||||||
XCLCOL(PGLOBAL g, PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i);
|
XCLCOL(PGLOBAL g, PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i);
|
||||||
|
|
||||||
// Methods
|
// Methods
|
||||||
|
using PRXCOL::Init;
|
||||||
virtual void Reset(void) {} // Evaluated only by TDBXCL
|
virtual void Reset(void) {} // Evaluated only by TDBXCL
|
||||||
virtual void ReadColumn(PGLOBAL g);
|
virtual void ReadColumn(PGLOBAL g);
|
||||||
virtual bool Init(PGLOBAL g, PTDBASE tp = NULL);
|
virtual bool Init(PGLOBAL g, PTDBASE tp = NULL);
|
||||||
|
|
|
@ -163,6 +163,7 @@ class TYPBLK : public VALBLK {
|
||||||
virtual void Reset(int n) {Typp[n] = 0;}
|
virtual void Reset(int n) {Typp[n] = 0;}
|
||||||
|
|
||||||
// Methods
|
// Methods
|
||||||
|
using VALBLK::SetValue;
|
||||||
virtual void SetValue(PSZ sp, int n);
|
virtual void SetValue(PSZ sp, int n);
|
||||||
virtual void SetValue(char *sp, uint len, int n);
|
virtual void SetValue(char *sp, uint len, int n);
|
||||||
virtual void SetValue(short sval, int n)
|
virtual void SetValue(short sval, int n)
|
||||||
|
@ -233,6 +234,7 @@ class CHRBLK : public VALBLK {
|
||||||
virtual bool IsCi(void) {return Ci;}
|
virtual bool IsCi(void) {return Ci;}
|
||||||
|
|
||||||
// Methods
|
// Methods
|
||||||
|
using VALBLK::SetValue;
|
||||||
virtual void SetValue(PSZ sp, int n);
|
virtual void SetValue(PSZ sp, int n);
|
||||||
virtual void SetValue(char *sp, uint len, int n);
|
virtual void SetValue(char *sp, uint len, int n);
|
||||||
virtual void SetValue(PVAL valp, int n);
|
virtual void SetValue(PVAL valp, int n);
|
||||||
|
@ -286,6 +288,7 @@ class STRBLK : public VALBLK {
|
||||||
virtual void Reset(int n) {Strp[n] = NULL;}
|
virtual void Reset(int n) {Strp[n] = NULL;}
|
||||||
|
|
||||||
// Methods
|
// Methods
|
||||||
|
using VALBLK::SetValue;
|
||||||
virtual void SetValue(PSZ sp, int n);
|
virtual void SetValue(PSZ sp, int n);
|
||||||
virtual void SetValue(char *sp, uint len, int n);
|
virtual void SetValue(char *sp, uint len, int n);
|
||||||
virtual void SetValue(PVAL valp, int n);
|
virtual void SetValue(PVAL valp, int n);
|
||||||
|
@ -322,6 +325,7 @@ class DATBLK : public TYPBLK<int> {
|
||||||
virtual char *GetCharString(char *p, int n);
|
virtual char *GetCharString(char *p, int n);
|
||||||
|
|
||||||
// Methods
|
// Methods
|
||||||
|
using TYPBLK<int>::SetValue;
|
||||||
virtual void SetValue(PSZ sp, int n);
|
virtual void SetValue(PSZ sp, int n);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
@ -345,6 +349,8 @@ class PTRBLK : public STRBLK {
|
||||||
// Implementation
|
// Implementation
|
||||||
|
|
||||||
// Methods
|
// Methods
|
||||||
|
using STRBLK::SetValue;
|
||||||
|
using STRBLK::CompVal;
|
||||||
virtual void SetValue(PSZ p, int n) {Strp[n] = p;}
|
virtual void SetValue(PSZ p, int n) {Strp[n] = p;}
|
||||||
virtual int CompVal(int i1, int i2);
|
virtual int CompVal(int i1, int i2);
|
||||||
|
|
||||||
|
|
|
@ -391,6 +391,7 @@ class DllExport XHUGE : public XLOAD {
|
||||||
XHUGE(void) : XLOAD() {}
|
XHUGE(void) : XLOAD() {}
|
||||||
|
|
||||||
// Methods
|
// Methods
|
||||||
|
using XLOAD::Close;
|
||||||
virtual bool Open(PGLOBAL g, char *filename, int id, MODE mode);
|
virtual bool Open(PGLOBAL g, char *filename, int id, MODE mode);
|
||||||
virtual bool Seek(PGLOBAL g, int low, int high, int origin);
|
virtual bool Seek(PGLOBAL g, int low, int high, int origin);
|
||||||
virtual bool Read(PGLOBAL g, void *buf, int n, int size);
|
virtual bool Read(PGLOBAL g, void *buf, int n, int size);
|
||||||
|
|
Loading…
Reference in a new issue