From ccc7b940126e3889d96b8cc2d94b6efbbba5424c Mon Sep 17 00:00:00 2001 From: prabatuty Date: Mon, 10 Nov 2008 05:13:18 +0000 Subject: [PATCH] fixing compilation error --- include/Index.h | 2 +- include/Makefile.in | 4 ++-- include/TableImpl.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/Index.h b/include/Index.h index 01c708f1..6fa2815e 100644 --- a/include/Index.h +++ b/include/Index.h @@ -127,7 +127,7 @@ class TreeIndex : public Index { TreeNode* locateNode(TreeNode *iter, void *tuple, IndexInfo *indInfo); - DbRetVal removeElement(TreeNode *iter, void *tuple, HashIndexInfo *info); + DbRetVal removeElement(Database *db, TreeNode *iter, void *tuple, HashIndexInfo *info); public: DbRetVal insert(TableImpl *tbl, Transaction *tr, void *indexPtr, IndexInfo *info, void *tuple, bool undoFlag); DbRetVal remove(TableImpl *tbl, Transaction *tr, void *indexPtr, IndexInfo *info, void *tuple, bool undoFlag); diff --git a/include/Makefile.in b/include/Makefile.in index 9f575f0e..9cd00f7d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -189,9 +189,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/Makefile + $(AUTOMAKE) --foreign include/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/include/TableImpl.h b/include/TableImpl.h index 5243b692..8a3a35f3 100644 --- a/include/TableImpl.h +++ b/include/TableImpl.h @@ -138,6 +138,7 @@ class TableImpl:public Table ~TableImpl(); void setDB(Database *db) { db_ = db; } + Database* getDB() { return db_;} void setSystemDB(Database *db) { sysDB_ = db; } void setLockManager(LockManager *lmgr) { lMgr_ = lmgr; } void setTrans(Transaction **t) { trans = t; } -- 2.11.4.GIT