* src/threads/posix/thread-posix.cpp: Eliminated some easy-to-fix or pointless compil...

[cacao.git] / src / vm / jit / verify / typeinfo.cpp

diff --git a/src/vm/jit/verify/typeinfo.cpp b/src/vm/jit/verify/typeinfo.cpp
index 1a02ca001819993ed04e2f20f6d1077922f9fa77..f4c2037fa0f8d82a83b44f5b8fea2d1b004c9c51 100644 (file)
--- a/src/vm/jit/verify/typeinfo.cpp
+++ b/src/vm/jit/verify/typeinfo.cpp
@@ -1,6 +1,6 @@
 /* src/vm/jit/verify/typeinfo.c - type system used by the type checker
 
-   Copyright (C) 1996-2005, 2006, 2007, 2008
+   Copyright (C) 1996-2005, 2006, 2007, 2008, 2010
    CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
@@ -28,13 +28,13 @@
 #include <assert.h>
 #include <string.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
-#include "toolbox/logging.h"
+#include "toolbox/logging.hpp"
 
 #include "vm/array.hpp"
 #include "vm/class.hpp"
-#include "vm/descriptor.h"
+#include "vm/descriptor.hpp"
 #include "vm/exceptions.hpp"
 #include "vm/globals.hpp"
 #include "vm/loader.hpp"
@@ -44,9 +44,6 @@
 #include "vm/jit/jit.hpp"
 #include "vm/jit/verify/typeinfo.hpp"
 
-#if defined(__cplusplus)
-extern "C" {
-#endif
 
 /* check if a linked class is an array class. Only use for linked classes! */
 #define CLASSINFO_IS_ARRAY(clsinfo)  ((clsinfo)->vftbl->arraydesc != NULL)
@@ -2282,7 +2279,7 @@ typeinfo_inc_dimension(typeinfo_t *info)
 #define TYPEINFO_TEST_MAXDIM  10
 
 static void
-typeinfo_testrun(char *filename)
+typeinfo_testrun(const char *filename)
 {
     char buf[TYPEINFO_TEST_BUFLEN];
     char bufa[TYPEINFO_TEST_BUFLEN];
@@ -2550,10 +2547,6 @@ typevector_print(FILE *file,varinfo *vec,int size)
     }
 }
 
-#if defined(__cplusplus)
-}
-#endif
-
 #endif /* TYPEINFO_DEBUG */
 
 
@@ -2563,7 +2556,7 @@ typevector_print(FILE *file,varinfo *vec,int size)
  * Emacs will automagically detect them.
  * ---------------------------------------------------------------------
  * Local variables:
- * mode: c
+ * mode: c++
  * indent-tabs-mode: t
  * c-basic-offset: 4
  * tab-width: 4