# HG changeset patch
# User coleenp
# Date 1380656499 14400
# Node ID f21415c32ca1772035f02123e523054a14d9c601
# Parent  31f0118ea58470491b705982f61d33329a76d457# Parent  5b3b75d9eb2f0fe0cf005e2b1c98973cd66d799a
Merge

diff -r 5b3b75d9eb2f -r f21415c32ca1 src/share/vm/utilities/array.hpp
--- a/src/share/vm/utilities/array.hpp	Tue Oct 01 14:23:07 2013 -0400
+++ b/src/share/vm/utilities/array.hpp	Tue Oct 01 15:41:39 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)); }