diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2015-01-27 19:18:51 +0100 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-01-27 19:18:51 +0100 |
commit | ee5a4c8b33b1a0dda9ef7422730dbe32f6b384a9 (patch) | |
tree | 90d793031aaec843ea89c4b1014a6dc95301e6d9 /storage/connect/valblk.h | |
parent | e7802bff0e13fc420e3a3421f89a161618b32b0b (diff) | |
download | mariadb-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/valblk.h')
-rw-r--r-- | storage/connect/valblk.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/storage/connect/valblk.h b/storage/connect/valblk.h index 654db0b57b7..5a98257f98f 100644 --- a/storage/connect/valblk.h +++ b/storage/connect/valblk.h @@ -163,6 +163,7 @@ class TYPBLK : public VALBLK { virtual void Reset(int n) {Typp[n] = 0;} // Methods + using VALBLK::SetValue; virtual void SetValue(PSZ sp, int n); virtual void SetValue(char *sp, uint len, int n); virtual void SetValue(short sval, int n) @@ -233,6 +234,7 @@ class CHRBLK : public VALBLK { virtual bool IsCi(void) {return Ci;} // Methods + using VALBLK::SetValue; virtual void SetValue(PSZ sp, int n); virtual void SetValue(char *sp, uint len, 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;} // Methods + using VALBLK::SetValue; virtual void SetValue(PSZ sp, int n); virtual void SetValue(char *sp, uint len, 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); // Methods + using TYPBLK<int>::SetValue; virtual void SetValue(PSZ sp, int n); protected: @@ -345,6 +349,8 @@ class PTRBLK : public STRBLK { // Implementation // Methods + using STRBLK::SetValue; + using STRBLK::CompVal; virtual void SetValue(PSZ p, int n) {Strp[n] = p;} virtual int CompVal(int i1, int i2); |