commit ae188c676c681e47a93ade7fdf0144099b470e03
author Carl Shapiro <cshapiro@google.com> Fri Apr 08 13:11:58 2011 -0700
committer Carl Shapiro <cshapiro@google.com> Fri Apr 08 13:11:58 2011 -0700
tree 0d7242995ffc8cfd11e484334786841ddc7bc2b5
parent a72475036290f55cd578dd15f65922dd01fbd3ce

Compile the garbage collector and heap profiler as C++.

Change-Id: I25d8fa821987a3dd6d7109d07fd42dbf2fe0e589

vm/oo/ObjectInlines.h

diff --git a/vm/oo/ObjectInlines.h b/vm/oo/ObjectInlines.h
index ef01834..1579a56 100644
--- a/vm/oo/ObjectInlines.h
+++ b/vm/oo/ObjectInlines.h
@@ -20,6 +20,10 @@
 #ifndef _DALVIK_OO_OBJECTINLINES
 #define _DALVIK_OO_OBJECTINLINES
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * Store a single value in the array, and if the value isn't null,
  * note in the write barrier.
@@ -354,4 +358,8 @@
     }
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*_DALVIK_OO_OBJECTINLINES*/