# HG changeset patch
# User zgu
# Date 1380639995 14400
# Node ID 462b1369ba093c52c3e314feb1635f4f3ade4ef0
# Parent  595a25ab947424c633214806c7aa1f366ea7a5b2# Parent  854bcc3ec8ef5fae8966ba4739de6edda4e72ff4
Merge

diff -r 595a25ab9474 -r 462b1369ba09 hotspot/src/share/vm/utilities/array.hpp
--- a/hotspot/src/share/vm/utilities/array.hpp	Tue Oct 01 08:10:42 2013 -0400
+++ b/hotspot/src/share/vm/utilities/array.hpp	Tue Oct 01 11:06:35 2013 -0400
@@ -353,9 +353,9 @@
   // sort the array.
   bool contains(const T& x) const      { return index_of(x) >= 0; }
 
-  T    at(int i) const                 { assert(i >= 0 && i< _length, err_msg_res("oob: 0 <= %d < %d", i, _length)); return _data[i]; }
-  void at_put(const int i, const T& x) { assert(i >= 0 && i< _length, err_msg_res("oob: 0 <= %d < %d", i, _length)); _data[i] = x; }
-  T*   adr_at(const int i)             { assert(i >= 0 && i< _length, err_msg_res("oob: 0 <= %d < %d", i, _length)); return &_data[i]; }
+  T    at(int i) const                 { assert(i >= 0 && i< _length, err_msg("oob: 0 <= %d < %d", i, _length)); return _data[i]; }
+  void at_put(const int i, const T& x) { assert(i >= 0 && i< _length, err_msg("oob: 0 <= %d < %d", i, _length)); _data[i] = x; }
+  T*   adr_at(const int i)             { assert(i >= 0 && i< _length, err_msg("oob: 0 <= %d < %d", i, _length)); return &_data[i]; }
   int  find(const T& x)                { return index_of(x); }
 
   T at_acquire(const int which)              { return OrderAccess::load_acquire(adr_at(which)); }