* configure.ac: New switch for disabling -O2 (--disable-optimizations).

[cacao.git] / src / vm / assertion.hpp

diff --git a/src/vm/assertion.hpp b/src/vm/assertion.hpp
index 625514cb10f751fb21740b9a365ca69371964eb1..2840b5595b7da23d2337a40e5bf883a661efa341 100644 (file)
--- a/src/vm/assertion.hpp
+++ b/src/vm/assertion.hpp
@@ -30,8 +30,7 @@
 
 #include <stdint.h>
 
-#include "vm/global.h"
-#include "toolbox/list.h"
+#include "toolbox/list.hpp"
 
 
 typedef struct assertion_name_t assertion_name_t;
@@ -40,16 +39,21 @@ struct assertion_name_t {
        char      *name;
        bool       enabled;
        bool       package;
-       listnode_t linkage;
+/*     listnode_t linkage; */
 };
 
 /* -ea/-esa/-da/-dsa options **************************************************/
 
-extern list_t  *list_assertion_names;
-extern int32_t  assertion_class_count;
-extern int32_t  assertion_package_count;
-extern bool     assertion_user_enabled;
-extern bool     assertion_system_enabled;
+#ifdef __cplusplus
+extern List<assertion_name_t*>*   list_assertion_names;
+#else
+extern List*   list_assertion_names;
+#endif
+
+extern int32_t assertion_class_count;
+extern int32_t assertion_package_count;
+extern bool    assertion_user_enabled;
+extern bool    assertion_system_enabled;
 
 /* function prototypes ********************************************************/