Skip to content

Commit 38c9c0d

Browse files
committed
Fix compile warnings and errors for nullptr. Modified /storage/connect/tabjmg (cpp and h)
1 parent f590296 commit 38c9c0d

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

storage/connect/tabjmg.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,20 @@
2727
#include "mycat.h" // for FNC_COL
2828
#include "filter.h"
2929

30+
#define nullptr 0
31+
3032
PQRYRES MGOColumns(PGLOBAL g, PCSZ db, PCSZ uri, PTOS topt, bool info);
3133

3234
/* -------------------------- Class JMGDISC -------------------------- */
3335

36+
/***********************************************************************/
37+
/* Constructor */
38+
/***********************************************************************/
39+
JMGDISC::JMGDISC(PGLOBAL g, int *lg) : MGODISC(g, lg)
40+
{
41+
drv = "Java"; Jcp = NULL; columnid = nullptr;
42+
}// end of JMGDISC constructor
43+
3444
/***********************************************************************/
3545
/* Initialyze. */
3646
/***********************************************************************/

storage/connect/tabjmg.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**************** tabjmg H Declares Source Code File (.H) **************/
2-
/* Name: tabjmg.h Version 1.0 */
2+
/* Name: tabjmg.h Version 1.1 */
33
/* */
44
/* (C) Copyright to the author Olivier BERTRAND 2017 */
55
/* */
@@ -15,8 +15,7 @@
1515
class JMGDISC : public MGODISC {
1616
public:
1717
// Constructor
18-
JMGDISC(PGLOBAL g, int *lg) : MGODISC(g, lg)
19-
{ drv = "Java"; Jcp = NULL; columnid = nullptr; }
18+
JMGDISC(PGLOBAL g, int *lg);
2019

2120
// Methods
2221
virtual bool Init(PGLOBAL g);

0 commit comments

Comments
 (0)