Bug 1256027 - Coerce VS2015 into compiling without warnings; r?froydnj
End state is Waldo's original patch, which so far has been the only
version that compiles on VS2015.
MozReview-Commit-ID: FCOaEvMqYB4
--- a/toolkit/xre/nsNativeAppSupportWin.cpp
+++ b/toolkit/xre/nsNativeAppSupportWin.cpp
@@ -501,17 +501,17 @@ struct MessageWindow {
// Class name: appName + "MessageWindow"
static const wchar_t *className() {
static wchar_t classNameBuffer[128];
static wchar_t *mClassName = 0;
if ( !mClassName ) {
::_snwprintf(classNameBuffer,
128, // size of classNameBuffer in PRUnichars
L"%s%s",
- wwc(NS_ConvertUTF8toUTF16(gAppData->remotingName).get()),
+ static_cast<const wchar_t*>(NS_ConvertUTF8toUTF16(gAppData->remotingName).get()),
L"MessageWindow" );
mClassName = classNameBuffer;
}
return mClassName;
}
// Create: Register class and create window.
NS_IMETHOD Create() {
@@ -664,17 +664,17 @@ nsNativeAppSupportWin::Start( bool *aRes
*aResult = false;
// Grab mutex first.
// Build mutex name from app name.
::_snwprintf(reinterpret_cast<wchar_t*>(mMutexName),
sizeof mMutexName / sizeof(char16_t), L"%s%s%s",
MOZ_MUTEX_NAMESPACE,
- wwc(NS_ConvertUTF8toUTF16(gAppData->name).get()),
+ static_cast<const wchar_t*>(NS_ConvertUTF8toUTF16(gAppData->name).get()),
MOZ_STARTUP_MUTEX_NAME );
Win32Mutex startupLock = Win32Mutex( mMutexName );
NS_ENSURE_TRUE( startupLock.Lock( MOZ_DDE_START_TIMEOUT ), NS_ERROR_FAILURE );
// Search for existing message window.
MessageWindow msgWindow;
if ( (HWND)msgWindow ) {