Disable warning and bump version.

rdoeffinger · Jul 28, 2019 · a787386 · a787386
1 parent 6eccb8b
commit a787386
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/impl11/ddraw/ddraw.rc b/impl11/ddraw/ddraw.rc
@@ -48,8 +48,8 @@ END
 //
 
 1 VERSIONINFO
- FILEVERSION 1,5,9
- PRODUCTVERSION 1,5,9
+ FILEVERSION 1,5,10
+ PRODUCTVERSION 1,5,10
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Jérémy Ansel"
             VALUE "FileDescription", "Direct3D 11 implementation for X-Wing series"
-            VALUE "FileVersion", "1.5.9"
+            VALUE "FileVersion", "1.5.10"
             VALUE "InternalName", "ddraw.dll"
             VALUE "LegalCopyright", "Copyright (C) Jérémy Ansel 2014, Reimar Döffinger 2015-2019"
             VALUE "OriginalFilename", "ddraw.dll"
             VALUE "ProductName", "xwa_ddraw_d3d11"
-            VALUE "ProductVersion", "1.5.9"
+            VALUE "ProductVersion", "1.5.10"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/impl11/ddraw/utils.cpp b/impl11/ddraw/utils.cpp
@@ -14,7 +14,10 @@ using namespace Gdiplus;
 std::string wchar_tostring(LPCWSTR text)
 {
 	std::wstring wstr(text);
+#pragma warning(push)
+#pragma warning(disable:4244)
 	return std::string(wstr.begin(), wstr.end());
+#pragma warning(pop)
 }
 
 #if LOGGER