Fix for issue 192 in domokit/mojo

runtime/vm/object.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 188 matching lines @@
   OBJECT_IMPLEMENTATION(object, super);                                        \
   const Raw##object* raw_ptr() const {                                         \
     ASSERT(raw() != null());                                                   \
     return raw()->ptr();                                                       \
   }                                                                            \
   SNAPSHOT_READER_SUPPORT(object)                                              \
   friend class Isolate;                                                        \
   friend class StackFrame;                                                     \
 
 // This macro is used to denote types that do not have a sub-type.
-#define FINAL_HEAP_OBJECT_IMPLEMENTATION(object, super)                        \
+#define FINAL_HEAP_OBJECT_IMPLEMENTATION_HELPER(object, rettype, super)        \
  public:  /* NOLINT */                                                         \
   void operator=(Raw##object* value) {                                         \
     raw_ = value;                                                              \
     CHECK_HANDLE();                                                            \
   }                                                                            \
   void operator^=(RawObject* value) {                                          \
     raw_ = value;                                                              \
     CHECK_HANDLE();                                                            \
   }                                                                            \
  private:  /* NOLINT */                                                        \
   object() : super() {}                                                        \
   BASE_OBJECT_IMPLEMENTATION(object, super)                                    \
   const Raw##object* raw_ptr() const {                                         \
     ASSERT(raw() != null());                                                   \
     return raw()->ptr();                                                       \
   }                                                                            \
   static intptr_t NextFieldOffset() {                                          \
     return -kWordSize;                                                         \
   }                                                                            \
-  SNAPSHOT_READER_SUPPORT(object)                                              \
+  SNAPSHOT_READER_SUPPORT(rettype)                                             \
   friend class Isolate;                                                        \
   friend class StackFrame;                                                     \
 
+#define FINAL_HEAP_OBJECT_IMPLEMENTATION(object, super)                        \
+  FINAL_HEAP_OBJECT_IMPLEMENTATION_HELPER(object, object, super)               \
+
+#define MINT_OBJECT_IMPLEMENTATION(object, rettype, super)                     \
+  FINAL_HEAP_OBJECT_IMPLEMENTATION_HELPER(object, rettype, super)              \
+
 class Object {
  public:
   virtual ~Object() { }
 
   RawObject* raw() const { return raw_; }
   void operator=(RawObject* value) {
     initializeHandle(this, value);
   }
 
   uword CompareAndSwapTags(uword old_tags, uword new_tags) const {
@@ skipping 5302 matching lines @@
   // Only Integer::NewXXX is allowed to call Mint::NewXXX directly.
   friend class Integer;
 
   static RawMint* New(int64_t value, Heap::Space space = Heap::kNew);
 
   static RawMint* NewCanonical(int64_t value);
 
  private:
   void set_value(int64_t value) const;
 
-  FINAL_HEAP_OBJECT_IMPLEMENTATION(Mint, Integer);
+  MINT_OBJECT_IMPLEMENTATION(Mint, Integer, Integer);
   friend class Class;
 };
 
 
 class Bigint : public Integer {
  public:
   virtual bool IsZero() const { return Used() == 0;}
   virtual bool IsNegative() const { return Neg(); }
   virtual bool Equals(const Instance& other) const;
 
@@ skipping 2282 matching lines @@
 
 
 RawObject* MegamorphicCache::GetTargetFunction(const Array& array,
                                                intptr_t index) {
   return array.At((index * kEntryLength) + kTargetFunctionIndex);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_