database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-30 05:23:50 +03:00
Code Activity

Move db_cxx.h to include dir, and fix valgrind issues. Fixes #197.

Browse Source 
git-svn-id: file:///svn/tokudb@1218 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Bradley C. Kuszmaul
2007-12-18 20:39:02 +00:00
parent a98f0cd111
commit b533ea01dd
8 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cxx/Makefile
View File

@@ -10,8 +10,7 @@ LIBNAME = libtdb_cxx
default: install default: install
install: $(LIBNAME).a install: $(LIBNAME).a
cp $< ../lib/ cp $< ../lib/
cp db_cxx.h ../include/ $(OBJS): ../include/db_cxx.h
$(OBJS): db_cxx.h
test1: test1.o dbt.o db.o dbenv.o ../lib/libdb.a test1: test1.o dbt.o db.o dbenv.o ../lib/libdb.a
$(LIBNAME).a: $(OBJS) $(LIBNAME).a: $(OBJS)

7
cxx/db.cpp
View File

@@ -1,16 +1,15 @@
#include <assert.h> #include <assert.h>
#include <db.h> #include <db.h>
#include <errno.h> #include <errno.h>
#include "db_cxx.h" #include <db_cxx.h>
Db::Db(DbEnv *env, u_int32_t flags) Db::Db(DbEnv *env, u_int32_t flags)
: the_Env(env) : the_Env(env)
{ {
the_db = 0; the_db = 0;
if (the_Env == 0) { is_private_env = (the_Env == 0);
is_private_env = 1;
}
DB *tmp_db; DB *tmp_db;
int ret = db_create(&tmp_db, the_Env->get_DB_ENV(), flags & !(DB_CXX_NO_EXCEPTIONS)); int ret = db_create(&tmp_db, the_Env->get_DB_ENV(), flags & !(DB_CXX_NO_EXCEPTIONS));
if (ret!=0) { if (ret!=0) {

2
cxx/dbc.cpp
View File

@@ -1,4 +1,4 @@
#include "db_cxx.h" #include <db_cxx.h>
int Dbc::close (void) { int Dbc::close (void) {
DBC *dbc = this; DBC *dbc = this;

2
cxx/dbenv.cpp
View File

@@ -1,5 +1,5 @@
#include <assert.h> #include <assert.h>
#include "db_cxx.h" #include <db_cxx.h>
DbEnv::DbEnv (u_int32_t flags) { DbEnv::DbEnv (u_int32_t flags) {
int ret = db_env_create(&the_env, flags & ~DB_CXX_NO_EXCEPTIONS); int ret = db_env_create(&the_env, flags & ~DB_CXX_NO_EXCEPTIONS);

2
cxx/dbt.cpp
View File

@@ -1,4 +1,4 @@
#include "db_cxx.h" #include <db_cxx.h>
Dbt::Dbt(void) { Dbt::Dbt(void) {
DBT *dbt = this; DBT *dbt = this;

2
cxx/dbtxn.cpp
View File

@@ -1,4 +1,4 @@
#include "db_cxx.h" #include <db_cxx.h>
int DbTxn::commit (u_int32_t flags) { int DbTxn::commit (u_int32_t flags) {
DB_TXN *txn = get_DB_TXN(); DB_TXN *txn = get_DB_TXN();

2
cxx/txn.cpp
View File

@@ -1,5 +1,5 @@
#include <assert.h> #include <assert.h>
#include "db_cxx.h" #include <db_cxx.h>
DbTxn::DbTxn(DB_TXN *txn) DbTxn::DbTxn(DB_TXN *txn)
: the_txn(txn) : the_txn(txn)

0
cxx/db_cxx.h → include/db_cxx.h
View File