diff src/share/vm/classfile/javaClasses.hpp @ 11015:7ee0d5c53c78

Merge
author chegar
date Wed, 08 May 2013 15:25:08 +0100
parents 4b52137b07c9 f258c5828eb8
children eaf3742822ec
line wrap: on
line diff
--- a/src/share/vm/classfile/javaClasses.hpp	Wed May 01 14:11:01 2013 +0100
+++ b/src/share/vm/classfile/javaClasses.hpp	Wed May 08 15:25:08 2013 +0100
@@ -153,7 +153,7 @@
   static char*  as_utf8_string(oop java_string, char* buf, int buflen);
   static char*  as_utf8_string(oop java_string, int start, int len);
   static char*  as_platform_dependent_str(Handle java_string, TRAPS);
-  static jchar* as_unicode_string(oop java_string, int& length);
+  static jchar* as_unicode_string(oop java_string, int& length, TRAPS);
   // produce an ascii string with all other values quoted using \u####
   static char*  as_quoted_ascii(oop java_string);