ftb version bump and small cleanup

2019-10-20 16:44:16 +02:00
parent 0d77893a90
commit 4002652d05
3 changed files with 7 additions and 6 deletions
@@ -22,3 +22,4 @@ todo.html
 *.svg
 /tests/libslime/main
 /tests/fullslime/main
+*.o
@@ -24,10 +24,11 @@
 #include "ftb/macros.hpp"
 #include "ftb/profiler.hpp"

-namespace Slime {
-    struct Lisp_Object;
-}
-
+/*
+  Forward declare the hash functions for the hashmap (needed at least
+  for clang++)
+*/
+namespace Slime {struct Lisp_Object;}
 bool hm_objects_match(char* a, char* b);
 bool hm_objects_match(void* a, void* b);
 bool hm_objects_match(Slime::Lisp_Object* a, Slime::Lisp_Object* b);
@@ -103,7 +104,6 @@ unsigned int hm_hash(Slime::Lisp_Object* obj) {
        return 0;
    }
 }
-#include "ftb/hashmap.hpp"

 namespace Slime {
 #    include "globals.cpp"