From c0a0f4add9a24412e9fdae1cd65fc722a4ace9fd Mon Sep 17 00:00:00 2001
From: Young Jin Kim <youki@microsoft.com>
Date: Wed, 4 Sep 2019 15:01:05 -0700
Subject: [PATCH] Fix windows build error

---
 src/common/aliases.cpp    | 4 ++--
 src/common/file_stream.h  | 8 ++++++++
 vs/Marian.vcxproj         | 1 +
 vs/Marian.vcxproj.filters | 3 +++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/common/aliases.cpp b/src/common/aliases.cpp
index 936f1f3a..50a6bc20 100644
--- a/src/common/aliases.cpp
+++ b/src/common/aliases.cpp
@@ -82,7 +82,7 @@ void ConfigParser::addAliases(cli::CLIWrapper& cli) {
     config["mini-batch"] = 1000;
     config["maxi-batch"] = 1000;
     config["workspace"] = 9500;
-    config["optimizer-params"] = std::vector<float>({0.9, 0.98, 1e-09});
+    config["optimizer-params"] = std::vector<float>({0.9f, 0.98f, 1e-09f});
 
     // Validation specific options
     config["beam-size"] = 8;
@@ -120,7 +120,7 @@ void ConfigParser::addAliases(cli::CLIWrapper& cli) {
     config["mini-batch"] = 1000;
     config["maxi-batch"] = 1000;
     config["workspace"] = 13000;
-    config["optimizer-params"] = std::vector<float>({0.9, 0.998, 1e-09});
+    config["optimizer-params"] = std::vector<float>({0.9f, 0.998f, 1e-09f});
 
     // Validation specific options
     config["beam-size"] = 8;
diff --git a/src/common/file_stream.h b/src/common/file_stream.h
index a950b089..4ce2d6ca 100644
--- a/src/common/file_stream.h
+++ b/src/common/file_stream.h
@@ -8,12 +8,20 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsuggest-override"
 #endif
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4101)
+#endif
 #include "3rd_party/zstr/zstr.hpp"
 #include <boost/iostreams/device/file_descriptor.hpp>
 #include <boost/iostreams/stream_buffer.hpp>
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 
 #include <iostream>
 #include <memory>
diff --git a/vs/Marian.vcxproj b/vs/Marian.vcxproj
index 91d05867..0de76f65 100755
--- a/vs/Marian.vcxproj
+++ b/vs/Marian.vcxproj
@@ -930,6 +930,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClCompile Include="..\src\common\aliases.cpp" />
     <ClCompile Include="..\src\common\binary.cpp" />
     <ClCompile Include="..\src\common\cli_helper.cpp" />
     <ClCompile Include="..\src\common\cli_wrapper.cpp" />
diff --git a/vs/Marian.vcxproj.filters b/vs/Marian.vcxproj.filters
index 23f5bdd4..f905636a 100755
--- a/vs/Marian.vcxproj.filters
+++ b/vs/Marian.vcxproj.filters
@@ -709,6 +709,9 @@
     <ClCompile Include="..\src\3rd_party\fbgemm\third_party\cpuinfo\deps\clog\src\clog.c">
       <Filter>3rd_party\fbgemm\third_party\cpuinfo\deps\clog\src</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\aliases.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\marian.h" />