* src/vm/jit/oprofile-agent.cpp: Set source formatting to c++.
[cacao.git] / src / vmcore / field.c
index 00c0680e9e61e29d2fec4365dad1e0f614fa1c99..4adcc03bbb5cdbe8416866c10d3156c9b29c9927 100644 (file)
 
 #include "vm/array.h"
 #include "vm/builtin.h"
-#include "vm/exceptions.h"
+#include "vm/exceptions.hpp"
 #include "vm/global.h"
-#include "vm/primitive.h"
-#include "vm/stringlocal.h"
-#include "vm/vm.h"
+#include "vm/primitive.hpp"
+#include "vm/string.hpp"
+#include "vm/vm.hpp"
 
 #include "vmcore/annotation.h"
 #include "vmcore/class.h"
@@ -364,7 +364,7 @@ classinfo *field_get_type(fieldinfo *f)
                c = load_class_from_classloader(u, f->clazz->classloader);
        }
        else {
-               c = primitive_class_get_by_type(td->decltype);
+               c = Primitive_get_class_by_type(td->primitivetype);
        }
 
        return c;