Mercurial > hg > truffle

diff src/share/vm/memory/allocation.hpp @ 14460:8a9bb7821e28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Wed, 19 Feb 2014 12:08:49 -0800
parents 63a4eb8bcd23 abec000618bf
children d8041d695d19
line wrap: on
line diff
--- a/src/share/vm/memory/allocation.hpp	Thu Feb 13 17:57:27 2014 +0100
+++ b/src/share/vm/memory/allocation.hpp	Wed Feb 19 12:08:49 2014 -0800
@@ -220,8 +220,11 @@
 class StackObj ALLOCATION_SUPER_CLASS_SPEC {
  private:
   void* operator new(size_t size) throw();
+  void* operator new [](size_t size) throw();
+#ifdef __IBMCPP__
+ public:
+#endif
   void  operator delete(void* p);
-  void* operator new [](size_t size) throw();
   void  operator delete [](void* p);
 };