summaryrefslogtreecommitdiff
path: root/storage/connect
diff options
context:
space:
mode:
Diffstat (limited to 'storage/connect')
-rw-r--r--storage/connect/blkfil.h12
-rw-r--r--storage/connect/block.h2
-rw-r--r--storage/connect/bson.h4
-rw-r--r--storage/connect/bsonudf.cpp4
-rw-r--r--storage/connect/bsonudf.h2
-rw-r--r--storage/connect/catalog.h2
-rw-r--r--storage/connect/colblk.h6
-rw-r--r--storage/connect/csort.h2
-rw-r--r--storage/connect/filamdbf.h2
-rw-r--r--storage/connect/filter.h2
-rw-r--r--storage/connect/jsonudf.h2
-rw-r--r--storage/connect/tabbson.h2
-rw-r--r--storage/connect/tabdos.h2
-rw-r--r--storage/connect/tabfix.h2
-rw-r--r--storage/connect/tabfmt.h2
-rw-r--r--storage/connect/tabjmg.h2
-rw-r--r--storage/connect/tabjson.h2
-rw-r--r--storage/connect/tabmul.h2
-rw-r--r--storage/connect/taboccur.h4
-rw-r--r--storage/connect/tabpivot.h2
-rw-r--r--storage/connect/tabsys.h4
-rw-r--r--storage/connect/tabutil.h2
-rw-r--r--storage/connect/tabvct.h2
-rw-r--r--storage/connect/tabvir.h4
-rw-r--r--storage/connect/tabxcl.h2
-rw-r--r--storage/connect/tabzip.h4
-rw-r--r--storage/connect/xtable.h2
27 files changed, 40 insertions, 40 deletions
diff --git a/storage/connect/blkfil.h b/storage/connect/blkfil.h
index 61b02c53c14..27e6fd4b166 100644
--- a/storage/connect/blkfil.h
+++ b/storage/connect/blkfil.h
@@ -31,7 +31,7 @@ class DllExport BLOCKFILTER : public BLOCK { /* Block Filter */
virtual void Prints(PGLOBAL g, char *ps, uint z);
protected:
- BLOCKFILTER(void) {} // Standard constructor not to be used
+ BLOCKFILTER(void) = default; // Standard constructor not to be used
// Members
PTDBDOS Tdbp; // Owner TDB
@@ -54,7 +54,7 @@ class DllExport BLKFILLOG : public BLOCKFILTER { /* Logical Op Block Filter */
virtual int BlockEval(PGLOBAL g);
protected:
- BLKFILLOG(void) {} // Standard constructor not to be used
+ BLKFILLOG(void) = default; // Standard constructor not to be used
// Members
PBF *Fil; // Points to Block filter args
@@ -75,7 +75,7 @@ class DllExport BLKFILARI : public BLOCKFILTER { /* Arithm. Op Block Filter */
virtual void MakeValueBitmap(void) {}
protected:
- BLKFILARI(void) {} // Standard constructor not to be used
+ BLKFILARI(void) = default; // Standard constructor not to be used
// Members
PDOSCOL Colp; // Points to column argument
@@ -97,7 +97,7 @@ class DllExport BLKFILAR2 : public BLKFILARI { /* Arithm. Op Block Filter */
virtual void MakeValueBitmap(void);
protected:
- BLKFILAR2(void) {} // Standard constructor not to be used
+ BLKFILAR2(void) = default; // Standard constructor not to be used
// Members
uint Bmp; // The value bitmap used to test blocks
@@ -118,7 +118,7 @@ class DllExport BLKFILMR2 : public BLKFILARI { /* Arithm. Op Block Filter */
virtual void MakeValueBitmap(void);
protected:
- BLKFILMR2(void) {} // Standard constructor not to be used
+ BLKFILMR2(void) = default; // Standard constructor not to be used
// Members
int Nbm; // The number of ULONG bitmaps
@@ -141,7 +141,7 @@ class DllExport BLKSPCARI : public BLOCKFILTER { /* Arithm. Op Block Filter */
virtual int BlockEval(PGLOBAL g);
protected:
- BLKSPCARI(void) {} // Standard constructor not to be used
+ BLKSPCARI(void) = default; // Standard constructor not to be used
// Members
PCOL Cpx; // Point to subquery "constant" column
diff --git a/storage/connect/block.h b/storage/connect/block.h
index e8871277d48..5351c2e6354 100644
--- a/storage/connect/block.h
+++ b/storage/connect/block.h
@@ -55,7 +55,7 @@ class DllExport BLOCK {
void operator delete(void*, long long) {}
void operator delete(void*) {}
- virtual ~BLOCK() {}
+ virtual ~BLOCK() = default;
}; // end of class BLOCK
#endif // !BLOCK_DEFINED
diff --git a/storage/connect/bson.h b/storage/connect/bson.h
index acc36e8e0ed..e3a15a41952 100644
--- a/storage/connect/bson.h
+++ b/storage/connect/bson.h
@@ -165,7 +165,7 @@ public:
protected:
// Default constructor not to be used
- BJSON(void) {}
+ BJSON(void) = default;
}; // end of class BJSON
/***********************************************************************/
@@ -203,5 +203,5 @@ protected:
bool comma; // True if Pretty = 1
// Default constructor not to be used
- BDOC(void) {}
+ BDOC(void) = default;
}; // end of class BDOC
diff --git a/storage/connect/bsonudf.cpp b/storage/connect/bsonudf.cpp
index 2114ed5c2af..f92bdb46727 100644
--- a/storage/connect/bsonudf.cpp
+++ b/storage/connect/bsonudf.cpp
@@ -3572,7 +3572,7 @@ char *bson_item_merge(UDF_INIT *initid, UDF_ARGS *args, char *result,
} // endif Xchk
if (!CheckMemory(g, initid, args, 2, false, false, true)) {
- JTYP type;
+ JTYP type= TYPE_JAR;
BJNX bnx(g);
PBVAL jvp = NULL, top = NULL;
PBVAL jsp[2] = {NULL, NULL};
@@ -5725,7 +5725,7 @@ char *bbin_item_merge(UDF_INIT *initid, UDF_ARGS *args, char *result,
} // endif Xchk
if (!CheckMemory(g, initid, args, 2, false, false, true)) {
- JTYP type;
+ JTYP type = TYPE_JAR;
BJNX bnx(g);
PBVAL jvp = NULL, top = NULL;
PBVAL jsp[2] = {NULL, NULL};
diff --git a/storage/connect/bsonudf.h b/storage/connect/bsonudf.h
index 0fe3715617e..e355fe7b48e 100644
--- a/storage/connect/bsonudf.h
+++ b/storage/connect/bsonudf.h
@@ -143,7 +143,7 @@ protected:
my_bool AddPath(void);
// Default constructor not to be used
- BJNX(void) {}
+ BJNX(void) = default;
// Members
PBVAL Row;
diff --git a/storage/connect/catalog.h b/storage/connect/catalog.h
index 48347d7519e..2649a50cf76 100644
--- a/storage/connect/catalog.h
+++ b/storage/connect/catalog.h
@@ -61,7 +61,7 @@ class DllExport CATALOG {
friend class OEMDEF;
public:
CATALOG(void); // Constructor
- virtual ~CATALOG() { } // Make -Wdelete-non-virtual-dtor happy
+ virtual ~CATALOG() = default; // Make -Wdelete-non-virtual-dtor happy
// Implementation
int GetCblen(void) {return Cblen;}
diff --git a/storage/connect/colblk.h b/storage/connect/colblk.h
index c9712f516b5..e67ba3ba3f9 100644
--- a/storage/connect/colblk.h
+++ b/storage/connect/colblk.h
@@ -177,7 +177,7 @@ class DllExport TIDBLK : public SPCBLK {
protected:
// Default constructor not to be used
- TIDBLK(void) {}
+ TIDBLK(void) = default;
// Members
PCSZ Tname; // The current table name
@@ -200,7 +200,7 @@ class DllExport PRTBLK : public SPCBLK {
protected:
// Default constructor not to be used
- PRTBLK(void) {}
+ PRTBLK(void) = default;
// Members
PCSZ Pname; // The current partition name
@@ -223,7 +223,7 @@ class DllExport SIDBLK : public SPCBLK {
protected:
// Default constructor not to be used
- SIDBLK(void) {}
+ SIDBLK(void) = default;
// Members
PCSZ Sname; // The current server name
diff --git a/storage/connect/csort.h b/storage/connect/csort.h
index 6e700059881..cce01df4199 100644
--- a/storage/connect/csort.h
+++ b/storage/connect/csort.h
@@ -33,7 +33,7 @@ class DllExport CSORT {
public:
// Constructor
CSORT(bool cns, int th = THRESH, int mth = MTHRESH);
- virtual ~CSORT() {}
+ virtual ~CSORT() = default;
protected:
// Implementation
/*********************************************************************/
diff --git a/storage/connect/filamdbf.h b/storage/connect/filamdbf.h
index dfe5cb5cfc4..6cf6331abd4 100644
--- a/storage/connect/filamdbf.h
+++ b/storage/connect/filamdbf.h
@@ -35,7 +35,7 @@ class DllExport DBFBASE {
protected:
// Default constructor, not to be used
- DBFBASE(void) {}
+ DBFBASE(void) = default;
// Members
int Records; /* records in the file */
diff --git a/storage/connect/filter.h b/storage/connect/filter.h
index 12ac3a169c1..0c3fa41046a 100644
--- a/storage/connect/filter.h
+++ b/storage/connect/filter.h
@@ -77,7 +77,7 @@ class DllExport FILTER : public XOBJECT { /* Filter description block */
// PFIL Copy(PTABS t);
protected:
- FILTER(void) {} // Standard constructor not to be used
+ FILTER(void) = default; // Standard constructor not to be used
void Constr(PGLOBAL g, OPVAL opc, int opm, PPARM *tp);
// Members
diff --git a/storage/connect/jsonudf.h b/storage/connect/jsonudf.h
index ada0dbcd96b..4378bddf9ba 100644
--- a/storage/connect/jsonudf.h
+++ b/storage/connect/jsonudf.h
@@ -349,7 +349,7 @@ protected:
my_bool AddPath(void);
// Default constructor not to be used
- JSNX(void) {}
+ JSNX(void) = default;
// Members
PJSON Row;
diff --git a/storage/connect/tabbson.h b/storage/connect/tabbson.h
index 1696f4dfdbc..9d5a8b7daf5 100644
--- a/storage/connect/tabbson.h
+++ b/storage/connect/tabbson.h
@@ -257,7 +257,7 @@ protected:
bool SetArrayOptions(PGLOBAL g, char* p, int i, PSZ nm);
// Default constructor not to be used
- BSONCOL(void) {}
+ BSONCOL(void) = default;
// Members
TDBBSN *Tbp; // To the JSN table block
diff --git a/storage/connect/tabdos.h b/storage/connect/tabdos.h
index 80dfe63845d..22bb5c63ce3 100644
--- a/storage/connect/tabdos.h
+++ b/storage/connect/tabdos.h
@@ -245,7 +245,7 @@ class DllExport DOSCOL : public COLBLK {
bool AddDistinctValue(PGLOBAL g);
// Default constructor not to be used
- DOSCOL(void) {}
+ DOSCOL(void) = default;
// Members
PVBLK Min; // Array of block min values
diff --git a/storage/connect/tabfix.h b/storage/connect/tabfix.h
index 5f859a2bffe..1a0d756bfcf 100644
--- a/storage/connect/tabfix.h
+++ b/storage/connect/tabfix.h
@@ -82,7 +82,7 @@ class DllExport BINCOL : public DOSCOL {
static void SetEndian(void);
protected:
- BINCOL(void) {} // Default constructor not to be used
+ BINCOL(void) = default; // Default constructor not to be used
// Members
static char Endian; // The host endian setting (L or B)
diff --git a/storage/connect/tabfmt.h b/storage/connect/tabfmt.h
index c46b5a3074e..268d00b1724 100644
--- a/storage/connect/tabfmt.h
+++ b/storage/connect/tabfmt.h
@@ -121,7 +121,7 @@ class DllExport CSVCOL : public DOSCOL {
protected:
// Default constructor not to be used
- CSVCOL(void) {}
+ CSVCOL(void) = default;
// Members
int Fldnum; // Field ordinal number (0 based)
diff --git a/storage/connect/tabjmg.h b/storage/connect/tabjmg.h
index cf7cff83b68..06c1462d103 100644
--- a/storage/connect/tabjmg.h
+++ b/storage/connect/tabjmg.h
@@ -118,7 +118,7 @@ public:
protected:
// Default constructor not to be used
- JMGCOL(void) {}
+ JMGCOL(void) = default;
//char *GetProjPath(PGLOBAL g);
//char *Mini(PGLOBAL g, const bson_t *bson, bool b);
diff --git a/storage/connect/tabjson.h b/storage/connect/tabjson.h
index 623e5b6d509..dcf40620dae 100644
--- a/storage/connect/tabjson.h
+++ b/storage/connect/tabjson.h
@@ -238,7 +238,7 @@ public:
PJSON GetRow(PGLOBAL g);
// Default constructor not to be used
- JSONCOL(void) {}
+ JSONCOL(void) = default;
// Members
PGLOBAL G; // Support of parse memory
diff --git a/storage/connect/tabmul.h b/storage/connect/tabmul.h
index a9d3f88cc44..a01e4e7fdf2 100644
--- a/storage/connect/tabmul.h
+++ b/storage/connect/tabmul.h
@@ -237,7 +237,7 @@ class DIRCOL : public COLBLK {
protected:
// Default constructor not to be used
- DIRCOL(void) {}
+ DIRCOL(void) = default;
#if defined(_WIN32)
void SetTimeValue(PGLOBAL g, FILETIME& ftime);
#endif // _WIN32
diff --git a/storage/connect/taboccur.h b/storage/connect/taboccur.h
index 13bc055cd6f..8cd507acb7d 100644
--- a/storage/connect/taboccur.h
+++ b/storage/connect/taboccur.h
@@ -99,7 +99,7 @@ class OCCURCOL : public COLBLK {
protected:
// Default constructor not to be used
- OCCURCOL(void) {}
+ OCCURCOL(void) = default;
// Members
int I;
@@ -121,7 +121,7 @@ class RANKCOL : public COLBLK {
protected:
// Default constructor not to be used
- RANKCOL(void) {}
+ RANKCOL(void) = default;
// Members
}; // end of class RANKCOL
diff --git a/storage/connect/tabpivot.h b/storage/connect/tabpivot.h
index d819d55a61a..0a37804ff87 100644
--- a/storage/connect/tabpivot.h
+++ b/storage/connect/tabpivot.h
@@ -188,7 +188,7 @@ class SRCCOL : public PRXCOL {
protected:
// Default constructor not to be used
- SRCCOL(void) {}
+ SRCCOL(void) = default;
// Members
}; // end of class SRCCOL
diff --git a/storage/connect/tabsys.h b/storage/connect/tabsys.h
index 0c6017af177..0a427b12dae 100644
--- a/storage/connect/tabsys.h
+++ b/storage/connect/tabsys.h
@@ -108,7 +108,7 @@ class INICOL : public COLBLK {
protected:
// Default constructor not to be used
- INICOL(void) {}
+ INICOL(void) = default;
// Members
char *Valbuf; // To the key value buffer
@@ -176,7 +176,7 @@ class XINCOL : public INICOL {
protected:
// Default constructor not to be used
- XINCOL(void) {}
+ XINCOL(void) = default;
// Members
}; // end of class XINICOL
diff --git a/storage/connect/tabutil.h b/storage/connect/tabutil.h
index c8e7e75106f..6cf2b11632b 100644
--- a/storage/connect/tabutil.h
+++ b/storage/connect/tabutil.h
@@ -122,7 +122,7 @@ class DllExport PRXCOL : public COLBLK {
char *Decode(PGLOBAL g, const char *cnm);
// Default constructor not to be used
- PRXCOL(void) {}
+ PRXCOL(void) = default;
// Members
PCOL Colp; // Points to matching table column
diff --git a/storage/connect/tabvct.h b/storage/connect/tabvct.h
index 189a9ae2221..06ccde71bcb 100644
--- a/storage/connect/tabvct.h
+++ b/storage/connect/tabvct.h
@@ -110,7 +110,7 @@ class DllExport VCTCOL : public DOSCOL {
virtual void ReadBlock(PGLOBAL g);
virtual void WriteBlock(PGLOBAL g);
- VCTCOL(void) {} // Default constructor not to be used
+ VCTCOL(void) = default; // Default constructor not to be used
// Members
PVBLK Blk; // Block buffer
diff --git a/storage/connect/tabvir.h b/storage/connect/tabvir.h
index e7313bbae67..b92ca0c50f8 100644
--- a/storage/connect/tabvir.h
+++ b/storage/connect/tabvir.h
@@ -21,7 +21,7 @@ PQRYRES VirColumns(PGLOBAL g, bool info);
class DllExport VIRDEF : public TABDEF { /* Logical table description */
public:
// Constructor
- VIRDEF(void) {}
+ VIRDEF(void) = default;
// Implementation
virtual const char *GetType(void) {return "VIRTUAL";}
@@ -86,7 +86,7 @@ class VIRCOL : public COLBLK {
protected:
// Default constructor not to be used
- VIRCOL(void) {}
+ VIRCOL(void) = default;
// No additional members
}; // end of class VIRCOL
diff --git a/storage/connect/tabxcl.h b/storage/connect/tabxcl.h
index 2ae96703548..08beb5fe6ac 100644
--- a/storage/connect/tabxcl.h
+++ b/storage/connect/tabxcl.h
@@ -95,7 +95,7 @@ class XCLCOL : public PRXCOL {
protected:
// Default constructor not to be used
- XCLCOL(void) {}
+ XCLCOL(void) = default;
// Members
char *Cbuf; // The column buffer
diff --git a/storage/connect/tabzip.h b/storage/connect/tabzip.h
index d36e4dc01d0..3c16fae99bc 100644
--- a/storage/connect/tabzip.h
+++ b/storage/connect/tabzip.h
@@ -23,7 +23,7 @@ class DllExport ZIPDEF : public DOSDEF { /* Table description */
friend class UNZFAM;
public:
// Constructor
- ZIPDEF(void) {}
+ ZIPDEF(void) = default;
// Implementation
virtual const char *GetType(void) {return "ZIP";}
@@ -94,7 +94,7 @@ public:
protected:
// Default constructor not to be used
- ZIPCOL(void) {}
+ ZIPCOL(void) = default;
// Members
TDBZIP *Tdbz;
diff --git a/storage/connect/xtable.h b/storage/connect/xtable.h
index 1b499e09047..58acf550a0b 100644
--- a/storage/connect/xtable.h
+++ b/storage/connect/xtable.h
@@ -264,7 +264,7 @@ class DllExport CATCOL : public COLBLK {
virtual void ReadColumn(PGLOBAL g);
protected:
- CATCOL(void) {} // Default constructor not to be used
+ CATCOL(void) = default; // Default constructor not to be used
// Members
PTDBCAT Tdbp; // Points to ODBC table block
View Lorry Controller Status