Merged branch subtype-trunk into default.

[cacao.git] / src / vm / access.cpp

diff --git a/src/vm/access.cpp b/src/vm/access.cpp
index a0abbc1569e81429bedaa00f7ec48dc1baacfbc4..73899e0e3a53b56dc810a50dd821b92b11e69493 100644 (file)
--- a/src/vm/access.cpp
+++ b/src/vm/access.cpp
@@ -30,7 +30,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/llni.h"
 
@@ -341,10 +341,10 @@ bool access_check_method(methodinfo *m, int callerdepth)
        return true;
 }
 
-#if defined(__cplusplus)
-}
 #endif
 
+#if defined(__cplusplus)
+}
 #endif