merged volatile memory barriers

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

diff --git a/src/vm/primitive.hpp b/src/vm/primitive.hpp
index 55f8cb67579372d9b332e3b27e639946ac52b4dc..c650521039b15acec2407f1e5ff1ff41e73cc289 100644 (file)
--- a/src/vm/primitive.hpp
+++ b/src/vm/primitive.hpp
@@ -32,7 +32,7 @@
 
 #include "vm/class.hpp"
 #include "vm/global.h"
-#include "vm/linker.h"
+#include "vm/linker.hpp"
 #include "vm/utf8.h"
 
 
@@ -50,6 +50,7 @@ public:
        static classinfo*     get_arrayclass_by_type(int type);
 
        static int            get_type_by_wrapperclass(classinfo *c);
+       static int            get_type_by_primitiveclass(classinfo *c);
 
        static java_handle_t* box(int type, imm_union value);
 
@@ -63,6 +64,7 @@ public:
        static java_handle_t* box(double value);
 
        static imm_union      unbox(java_handle_t *o);
+       static bool           unbox_typed(java_handle_t *o, int type, imm_union* value);
 
        static uint8_t        unbox_boolean(java_handle_t* o);
        static int8_t         unbox_byte(java_handle_t* o);
@@ -125,13 +127,6 @@ extern primitivetypeinfo primitivetype_table[PRIMITIVETYPE_COUNT];
 void       primitive_init(void);
 void       primitive_postinit(void);
 
-#ifndef __cplusplus
-// Legacy C interface.
-classinfo *Primitive_get_class_by_name(utf *name);
-classinfo *Primitive_get_class_by_type(int type);
-classinfo *Primitive_get_arrayclass_by_type(int type);
-#endif
-
 #endif // _PRIMITIVE_HPP