1.1 --- a/jitcraft/Barriers.h	Tue Jul 03 08:30:09 2012 -0700
     1.2 +++ b/jitcraft/Barriers.h	Tue Jul 03 09:25:18 2012 -0700
     1.3 @@ -18,9 +18,9 @@
     1.4  #ifndef _include_jitcraft_barriers_h_
     1.5  #define _include_jitcraft_barriers_h_
     1.6  
     1.7 -class Object;
     1.8 +namespace jc {
     1.9  
    1.10 -namespace jc {
    1.11 +class Object;
    1.12  
    1.13  // Used to store unbarriered heap locations.
    1.14  template <typename T>
    1.15 @@ -44,8 +44,8 @@
    1.16          obj_ = obj;
    1.17          return *this;
    1.18      }
    1.19 -    Object **addr() {
    1.20 -        return &obj_;
    1.21 +    Object **address() {
    1.22 +        return reinterpret_cast<Object **>(&obj_);
    1.23      }
    1.24      operator bool () const {
    1.25          return !!obj_;