Merge
authorohair
Fri, 08 May 2009 11:24:17 -0700
changeset 2796 8f7662a82339
parent 2794 8a0d0b5c3e73 (current diff)
parent 2795 8ceb16c7fbf3 (diff)
child 2797 0285c9a8502b
Merge
jdk/src/windows/native/sun/windows/awt_Window.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Window.cpp	Thu May 07 12:26:22 2009 -0700
+++ b/jdk/src/windows/native/sun/windows/awt_Window.cpp	Fri May 08 11:24:17 2009 -0700
@@ -464,7 +464,8 @@
         size_t length = env->GetStringLength(javaWarningString) + 1;
         warningString = new WCHAR[length];
         env->GetStringRegion(javaWarningString, 0,
-                static_cast<jsize>(length - 1), warningString);
+                static_cast<jsize>(length - 1),
+                reinterpret_cast<jchar*>(warningString));
         warningString[length-1] = L'\0';
 
         env->DeleteLocalRef(javaWarningString);