Merge
authorzgu
Tue, 01 Oct 2013 09:21:43 -0400
changeset 20286 854bcc3ec8ef
parent 20285 2248009a3749 (diff)
parent 20283 ddf704c33210 (current diff)
child 20287 462b1369ba09
Merge
jdk/src/macosx/classes/sun/lwawt/SelectionClearListener.java
jdk/src/macosx/classes/sun/lwawt/macosx/CMouseInfoPeer.java
jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh
jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so
jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so
jdk/test/java/util/regex/PatternTest.java
--- a/hotspot/src/share/vm/utilities/array.hpp	Fri Sep 27 10:08:56 2013 -0400
+++ b/hotspot/src/share/vm/utilities/array.hpp	Tue Oct 01 09:21:43 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)); }