*** old/src/share/vm/oops/oopsHierarchy.hpp	Thu May 22 13:13:28 2014
--- new/src/share/vm/oops/oopsHierarchy.hpp	Thu May 22 13:13:27 2014

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 110,135 ****
--- 110,132 ----
    bool operator>=(oop o) const        { return obj() >= o.obj(); }
    bool operator!() const              { return !obj(); }
  
    // Assignment
    oop& operator=(const oop& o)                            { _o = o.obj(); return *this; }
  #ifndef SOLARIS
    volatile oop& operator=(const oop& o) volatile          { _o = o.obj(); return *this; }
  #endif
    volatile oop& operator=(const volatile oop& o) volatile { _o = o.obj(); return *this; }
  
    // Explict user conversions
    operator void* () const             { return (void *)obj(); }
  #ifndef SOLARIS
    operator void* () const volatile    { return (void *)obj(); }
  #endif
    operator HeapWord* () const         { return (HeapWord*)obj(); }
!   operator oopDesc* () const          { return obj(); }
!   operator oopDesc* () const volatile { return obj(); }
    operator intptr_t* () const         { return (intptr_t*)obj(); }
    operator PromotedObject* () const   { return (PromotedObject*)obj(); }
    operator markOop () const           { return markOop(obj()); }
  
    operator address   () const         { return (address)obj(); }
  
    // from javaCalls.cpp
    operator jobject () const           { return (jobject)obj(); }
    // from javaClasses.cpp

*** 159,173 ****
--- 156,169 ----
         }                                                                   \
         type##Oop& operator=(const type##Oop& o) {                          \
              oop::operator=(o);                                             \
              return *this;                                                  \
         }                                                                   \
         NOT_SOLARIS(                                                        \
         volatile type##Oop& operator=(const type##Oop& o) volatile {        \
              (void)const_cast<oop&>(oop::operator=(o));                     \
              return *this;                                                  \
!        })                                                                  \
!        }                                                                   \
         volatile type##Oop& operator=(const volatile type##Oop& o) volatile {\
              (void)const_cast<oop&>(oop::operator=(o));                     \
              return *this;                                                  \
         }                                                                   \
     };