Merge
authorohair
Fri, 08 May 2009 11:24:17 -0700
changeset 12107ec6857812d2
parent 1208 39d93fb6926c
parent 1209 6ca1c622dd6e
child 1211 9eeeeee69368
Merge
src/windows/native/sun/windows/awt_Window.cpp
     1.1 --- a/src/windows/native/sun/windows/awt_Window.cpp	Thu May 07 12:26:22 2009 -0700
     1.2 +++ b/src/windows/native/sun/windows/awt_Window.cpp	Fri May 08 11:24:17 2009 -0700
     1.3 @@ -464,7 +464,8 @@
     1.4          size_t length = env->GetStringLength(javaWarningString) + 1;
     1.5          warningString = new WCHAR[length];
     1.6          env->GetStringRegion(javaWarningString, 0,
     1.7 -                static_cast<jsize>(length - 1), warningString);
     1.8 +                static_cast<jsize>(length - 1),
     1.9 +                reinterpret_cast<jchar*>(warningString));
    1.10          warningString[length-1] = L'\0';
    1.11  
    1.12          env->DeleteLocalRef(javaWarningString);