From 85e8aee47d2e1cc58857148293f84ccd7e2ec620 Mon Sep 17 00:00:00 2001 From: Olivier Bertrand Date: Mon, 10 Mar 2014 12:21:17 +0100 Subject: - Temporary modified: storage/connect/catalog.h storage/connect/colblk.cpp storage/connect/colblk.h storage/connect/connect.cc storage/connect/filamap.cpp storage/connect/filamfix.cpp storage/connect/filamfix.h storage/connect/filamtxt.cpp storage/connect/filamvct.cpp storage/connect/filamzip.cpp storage/connect/filamzip.h storage/connect/ha_connect.cc storage/connect/ha_connect.h storage/connect/plgdbsem.h storage/connect/plgdbutl.cpp storage/connect/reldef.cpp storage/connect/reldef.h storage/connect/tabdos.cpp storage/connect/tabdos.h storage/connect/tabfix.cpp storage/connect/tabfix.h storage/connect/tabfmt.cpp storage/connect/tabfmt.h storage/connect/table.cpp storage/connect/tabmac.h storage/connect/tabmul.h storage/connect/tabmysql.cpp storage/connect/tabodbc.cpp storage/connect/tabsys.cpp storage/connect/tabsys.h storage/connect/tabtbl.cpp storage/connect/tabtbl.h storage/connect/tabvct.cpp storage/connect/tabvct.h storage/connect/tabwmi.cpp storage/connect/tabwmi.h storage/connect/tabxml.cpp storage/connect/tabxml.h storage/connect/valblk.cpp storage/connect/valblk.h storage/connect/value.cpp storage/connect/value.h storage/connect/xobject.cpp storage/connect/xobject.h storage/connect/xtable.h --- storage/connect/xobject.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'storage/connect/xobject.h') diff --git a/storage/connect/xobject.h b/storage/connect/xobject.h index b7869be96b2..793a08ddb9e 100644 --- a/storage/connect/xobject.h +++ b/storage/connect/xobject.h @@ -68,7 +68,7 @@ class DllExport XOBJECT : public BLOCK { virtual bool CheckLocal(PTDB) {return true;} virtual int CheckSpcCol(PTDB, int) {return 2;} virtual bool CheckSort(PTDB) {return false;} - virtual bool VerifyColumn(PTBX txp) {return false;} + virtual bool VerifyColumn(PTDB txp) {return false;} virtual bool VerifyTdb(PTDB& tdbp) {return false;} virtual bool IsColInside(PCOL colp) {return false;} @@ -123,10 +123,12 @@ class DllExport CONSTANT : public XOBJECT { virtual bool SetFormat(PGLOBAL g, FORMAT& fmt) {return Value->SetConstFormat(g, fmt);} virtual int CheckSpcCol(PTDB, int) {return 1;} -// void Convert(PGLOBAL g, int newtype); +#if defined(BLK_INDX) + void Convert(PGLOBAL g, int newtype); +#endif // BLK_INDX // bool Rephrase(PGLOBAL g, PSZ work); void SetValue(PVAL vp) {Value = vp;} - virtual bool VerifyColumn(PTBX txp) {return true;} + virtual bool VerifyColumn(PTDB txp) {return true;} virtual bool VerifyTdb(PTDB& tdbp) {return true;} virtual void Print(PGLOBAL g, FILE *, uint); virtual void Print(PGLOBAL g, char *, uint); -- cgit v1.2.1