commit 1b09b094a85e03f6ef5f687f58bb91c433273ba1
author Ian Rogers <irogers@google.com> Mon Aug 20 15:35:52 2012 -0700
committer Ian Rogers <irogers@google.com> Mon Aug 20 15:35:52 2012 -0700
tree 6b039e520ee3b73e6ba5fb23954b9e01ecc68fc9
parent 931c278aed62d7a97b87cf1bb9cfdd189e77eb24

Syntax clean up to make clang happy.

Change-Id: I0984c395bbd1ee4b206eafd19915b6f68781dd16

src/object.h

diff --git a/src/object.h b/src/object.h
index 03ed132..dfb34e0 100644
--- a/src/object.h
+++ b/src/object.h
@@ -546,7 +546,7 @@
 // C++ mirror of java.lang.reflect.Method and java.lang.reflect.Constructor
 class MANAGED Method : public Object {
  public:
-  // An function that invokes a method with an array of its arguments.
+  // A function that invokes a method with an array of its arguments.
   typedef void InvokeStub(const Method* method,
                           Object* obj,
                           Thread* thread,
@@ -857,7 +857,7 @@
   }
 
   // Native to managed invocation stub entry point
-  const InvokeStub* GetInvokeStub() const {
+  InvokeStub* GetInvokeStub() const {
     InvokeStub* result = GetFieldPtr<InvokeStub*>(
         OFFSET_OF_OBJECT_MEMBER(Method, invoke_stub_), false);
     // TODO: DCHECK(result != NULL);  should be ahead of time compiled
@@ -865,8 +865,8 @@
   }
 
   void SetInvokeStub(InvokeStub* invoke_stub) {
-    SetFieldPtr<const InvokeStub*>(OFFSET_OF_OBJECT_MEMBER(Method, invoke_stub_),
-                                   invoke_stub, false);
+    SetFieldPtr<InvokeStub*>(OFFSET_OF_OBJECT_MEMBER(Method, invoke_stub_),
+                             invoke_stub, false);
   }
 
   uint32_t GetInvokeStubSize() const {
@@ -1010,7 +1010,7 @@
   const uint8_t* gc_map_;
 
   // Native invocation stub entry point for calling from native to managed code.
-  const InvokeStub* invoke_stub_;
+  InvokeStub* invoke_stub_;
 
   // Mapping from native pc to dex pc
   const uint32_t* mapping_table_;