Mercurial > hg > truffle
diff src/share/vm/memory/allocation.hpp @ 7482:989155e2d07a
Merge with hs25-b15.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Wed, 16 Jan 2013 01:34:24 +0100 |
parents | 291ffc492eb6 32164d89fe9c |
children | 5fc51c1ecdeb |
line wrap: on
line diff
--- a/src/share/vm/memory/allocation.hpp Tue Jan 15 18:54:02 2013 +0100 +++ b/src/share/vm/memory/allocation.hpp Wed Jan 16 01:34:24 2013 +0100 @@ -205,7 +205,7 @@ // Calling new or delete will result in fatal error. class StackObj ALLOCATION_SUPER_CLASS_SPEC { - public: + private: void* operator new(size_t size); void operator delete(void* p); }; @@ -229,7 +229,7 @@ // be defined as a an empty string "". // class _ValueObj { - public: + private: void* operator new(size_t size); void operator delete(void* p); };