Changeset 4640c75a8385ecb909a2b09d28eca23a6c4f6130

Timestamp:

04/21/08 09:19:13 (9 months ago)

Author:

krayouva <krayouva@…>

Parents:

3e94658359c07330b5ea11ae8520fd41e676bba5

Children:

63d246bfa1ad0af79d78e35671481fbfa7ad3129

git-committer:

krayouva <krayouva@gmail.com> / 2008-04-20T19:19:13Z-0400

Message:

* C++ code wasn't compiling for me because of C linkage

- We'll need to add the extern "C" linkage to our headers at some point so

that they compile under g++

Location:

c/benchmark

Files:

• benchmark.h (modified) (1 diff)
• bm_hash.c (modified) (4 diffs)

c/benchmark/benchmark.h

@@ -9 +9 @@
 
 #define BM_RUN_COUNT 6
+#ifdef __cplusplus
+#define BENCH(name) extern "C" void bm_##name(BenchMark *bm)
+#else
 #define BENCH(name) void bm_##name(BenchMark *bm)
+#endif
 
 extern const char *WORD_LIST[];

c/benchmark/bm_hash.c

@@ -4 +4 @@
 #endif
 #include <string.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
 #include "hash.h"
 #include "benchmark.h"
+#ifdef __cplusplus
+}
+#endif
 
 #define N 20
@@ -19 +25 @@
         for (word = WORD_LIST; *word; word++) {
             h_set(h, *word, (void *)1);
+        }
+        for (word = WORD_LIST; *word; word++) {
             strcpy(buf, *word);
             res = (long)h_get(h, buf);
@@ -31 +39 @@
 #include <ext/hash_map>
 
-using std::cout;
-using std::endl;
 using __gnu_cxx::hash_map;
 
@@ -51 +57 @@
         long res;
         for (word = WORD_LIST; *word; word++) {
-            strcpy(buf, *word);
             dict[*word] = 1;
+        }
+        for (word = WORD_LIST; *word; word++) {
+            strcpy(buf, *word);
             res = dict[buf];
         }