aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Buland <eichlan@xagasoft.com>2006-10-11 14:33:07 +0000
committerMike Buland <eichlan@xagasoft.com>2006-10-11 14:33:07 +0000
commit67c0930cbe7d0646cf4e4dee157ea553ee8a045a (patch)
tree3d3a751c871bd93077933c8f7daf28beba6b337a
parent4a2cacc7975b635b32c7cd7c6ac274639477ed8c (diff)
downloadlibbu++-67c0930cbe7d0646cf4e4dee157ea553ee8a045a.tar.gz
libbu++-67c0930cbe7d0646cf4e4dee157ea553ee8a045a.tar.bz2
libbu++-67c0930cbe7d0646cf4e4dee157ea553ee8a045a.tar.xz
libbu++-67c0930cbe7d0646cf4e4dee157ea553ee8a045a.zip
Bugfixes, and pymake removal.
Diffstat (limited to '')
-rw-r--r--Makefile6
-rw-r--r--pymake.conf29
-rw-r--r--pymake.tests.conf54
-rw-r--r--src/hashtable.cpp1
4 files changed, 4 insertions, 86 deletions
diff --git a/Makefile b/Makefile
index 2257ecc..7e45c16 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
1.PHONY: pymake 1.PHONY: build
2 2
3pymake: 3build:
4 pymake 4 build
diff --git a/pymake.conf b/pymake.conf
deleted file mode 100644
index 16ed18e..0000000
--- a/pymake.conf
+++ /dev/null
@@ -1,29 +0,0 @@
1### pymake by ~3o~ph()g (neonphog.com) ###
2## This skeleton file was generated by pymake... please edit for your project.
3
4CXXFLAGS: -ggdb -fPIC
5LDFLAGS: -ggdb
6
7[BUILD]
8DIR: src
9COMMAND: lib
10OUTPUT: libbu++.a
11
12[TRIGGER]
13INPUT: .cpp #take input of *.cpp files
14OUTPUT: .o #output .o files
15COMMAND: g++ -fPIC -c {INPUT} {CXXFLAGS} -I{DIR} -o {OUTPUT}
16CHECK: g++ -M {INPUT} {CXXFLAGS} -I{DIR}
17
18### Executable command ###
19## Use this command if you want a simple executable
20[COMMAND]
21NAME: exe
22COMMAND: g++ {INPUT} {LDFLAGS} -o {OUTPUT}
23
24### Library command ###
25## Use this command if you wish to create a library
26[COMMAND]
27NAME: lib
28COMMAND: ar cr{ARFLAGS} {OUTPUT} {INPUT}
29
diff --git a/pymake.tests.conf b/pymake.tests.conf
deleted file mode 100644
index d5719d4..0000000
--- a/pymake.tests.conf
+++ /dev/null
@@ -1,54 +0,0 @@
1### pymake by ~3o~ph()g (neonphog.com) ###
2## This skeleton file was generated by pymake... please edit for your project.
3
4CXXFLAGS: -ggdb -fPIC
5LDFLAGS: -ggdb
6
7#[BUILD]
8#DIR: src
9#COMMAND: lib
10#OUTPUT: libbu++.a
11
12#
13# Uncomment this if you want to build the tests, these don't rely on anything
14# that libbu++ doesn't rely on.
15#
16[DIRBUILD]
17COMMAND: exe
18OUTPUT: tests/{NAME}
19ROOT: src/test
20LDFLAGS: -L. -lbu++
21CXXFLAGS: -Isrc -Isrc/test
22
23[OVERRIDE]
24FILE: tests/plugin
25LDFLAGS: -ldl
26
27#
28# Uncomment this if you have cpptest and want to build the unit tests
29#
30#[DIRBUILD]
31#COMMAND: exe
32#OUTPUT: unit/{NAME}
33#ROOT: src/unit
34#LDFLAGS: -L. -lbu++ -lcpptest
35#CXXFLAGS: -Isrc
36
37[TRIGGER]
38INPUT: .cpp #take input of *.cpp files
39OUTPUT: .o #output .o files
40COMMAND: g++ -fPIC -c {INPUT} {CXXFLAGS} -I{DIR} -o {OUTPUT}
41CHECK: g++ -M {INPUT} {CXXFLAGS} -I{DIR}
42
43### Executable command ###
44## Use this command if you want a simple executable
45[COMMAND]
46NAME: exe
47COMMAND: g++ {INPUT} {LDFLAGS} -o {OUTPUT}
48
49### Library command ###
50## Use this command if you wish to create a library
51[COMMAND]
52NAME: lib
53COMMAND: ar cr{ARFLAGS} {OUTPUT} {INPUT}
54
diff --git a/src/hashtable.cpp b/src/hashtable.cpp
index 37c3149..725ebc4 100644
--- a/src/hashtable.cpp
+++ b/src/hashtable.cpp
@@ -399,6 +399,7 @@ bool HashTable::del( const void *id, int nSkip )
399 for( unsigned long int j=0; j < 32; nPos = (nPos+(1<<j))%nTableSize, j++ ) 399 for( unsigned long int j=0; j < 32; nPos = (nPos+(1<<j))%nTableSize, j++ )
400 { 400 {
401 if( !isFilled( nPos ) ) return false; 401 if( !isFilled( nPos ) ) return false;
402 //printf("0x%08X \"%s\" == 0x%08X \"%s\" (%d)\n", id, id, aTable[nPos].id, aTable[nPos].id, nPos );
402 if( hFunc->cmpIDs( id, aTable[nPos].id ) && 403 if( hFunc->cmpIDs( id, aTable[nPos].id ) &&
403 aTable[nPos].bDeleted == false ) 404 aTable[nPos].bDeleted == false )
404 { 405 {