diff options
-rw-r--r-- | Makefile | 6 | ||||
-rw-r--r-- | pymake.conf | 29 | ||||
-rw-r--r-- | pymake.tests.conf | 54 | ||||
-rw-r--r-- | src/hashtable.cpp | 1 |
4 files changed, 4 insertions, 86 deletions
@@ -1,4 +1,4 @@ | |||
1 | .PHONY: pymake | 1 | .PHONY: build |
2 | 2 | ||
3 | pymake: | 3 | build: |
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 | |||
4 | CXXFLAGS: -ggdb -fPIC | ||
5 | LDFLAGS: -ggdb | ||
6 | |||
7 | [BUILD] | ||
8 | DIR: src | ||
9 | COMMAND: lib | ||
10 | OUTPUT: libbu++.a | ||
11 | |||
12 | [TRIGGER] | ||
13 | INPUT: .cpp #take input of *.cpp files | ||
14 | OUTPUT: .o #output .o files | ||
15 | COMMAND: g++ -fPIC -c {INPUT} {CXXFLAGS} -I{DIR} -o {OUTPUT} | ||
16 | CHECK: g++ -M {INPUT} {CXXFLAGS} -I{DIR} | ||
17 | |||
18 | ### Executable command ### | ||
19 | ## Use this command if you want a simple executable | ||
20 | [COMMAND] | ||
21 | NAME: exe | ||
22 | COMMAND: g++ {INPUT} {LDFLAGS} -o {OUTPUT} | ||
23 | |||
24 | ### Library command ### | ||
25 | ## Use this command if you wish to create a library | ||
26 | [COMMAND] | ||
27 | NAME: lib | ||
28 | COMMAND: 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 | |||
4 | CXXFLAGS: -ggdb -fPIC | ||
5 | LDFLAGS: -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] | ||
17 | COMMAND: exe | ||
18 | OUTPUT: tests/{NAME} | ||
19 | ROOT: src/test | ||
20 | LDFLAGS: -L. -lbu++ | ||
21 | CXXFLAGS: -Isrc -Isrc/test | ||
22 | |||
23 | [OVERRIDE] | ||
24 | FILE: tests/plugin | ||
25 | LDFLAGS: -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] | ||
38 | INPUT: .cpp #take input of *.cpp files | ||
39 | OUTPUT: .o #output .o files | ||
40 | COMMAND: g++ -fPIC -c {INPUT} {CXXFLAGS} -I{DIR} -o {OUTPUT} | ||
41 | CHECK: g++ -M {INPUT} {CXXFLAGS} -I{DIR} | ||
42 | |||
43 | ### Executable command ### | ||
44 | ## Use this command if you want a simple executable | ||
45 | [COMMAND] | ||
46 | NAME: exe | ||
47 | COMMAND: g++ {INPUT} {LDFLAGS} -o {OUTPUT} | ||
48 | |||
49 | ### Library command ### | ||
50 | ## Use this command if you wish to create a library | ||
51 | [COMMAND] | ||
52 | NAME: lib | ||
53 | COMMAND: 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 | { |