From: starg <starg@users.osdn.me>
Date: Fri, 26 Aug 2016 21:58:30 +0000 (+0900)
Subject: 64 ビット版の警告に対処
X-Git-Tag: v0.1.827.0^0
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=87d7319fc3045e1412f5efc322702b48b802dd08;p=yamml%2Fyamml-git.git

64 ビット版の警告に対処
---

diff --git a/src/driver/file_win.cpp b/src/driver/file_win.cpp
index 8d48648..892e0e7 100644
--- a/src/driver/file_win.cpp
+++ b/src/driver/file_win.cpp
@@ -114,7 +114,7 @@ public:
         std::array<std::uint8_t, 4096> buffer;
         DWORD bytes = 0;
 
-        while (::ReadFile(m_hFile, buffer.data(), buffer.size(), &bytes, nullptr) && bytes > 0)
+        while (::ReadFile(m_hFile, buffer.data(), static_cast<DWORD>(buffer.size()), &bytes, nullptr) && bytes > 0)
         {
             ret.insert(ret.end(), buffer.begin(), buffer.begin() + bytes);
         }
@@ -130,7 +130,7 @@ public:
             throw std::logic_error("File is not opened yet.");
         }
 
-        if (!::WriteFile(m_hFile, c.data(), c.size(), nullptr, nullptr))
+        if (!::WriteFile(m_hFile, c.data(), static_cast<DWORD>(c.size()), nullptr, nullptr))
         {
             throw IOException();
         }
diff --git a/src/driver/stderrwriter_win.cpp b/src/driver/stderrwriter_win.cpp
index 4b39f6a..e678476 100644
--- a/src/driver/stderrwriter_win.cpp
+++ b/src/driver/stderrwriter_win.cpp
@@ -27,7 +27,7 @@ public:
     virtual void Write(const std::string& str) override
     {
         UTF82W wstr(str);
-        ::WriteConsoleW(m_hStdErr, wstr.GetCString(), wstr.GetString().length(), nullptr, nullptr);
+        ::WriteConsoleW(m_hStdErr, wstr.GetCString(), static_cast<DWORD>(wstr.GetString().length()), nullptr, nullptr);
     }
 
 private:
@@ -45,7 +45,7 @@ public:
 
     virtual void Write(const std::string& str) override
     {
-        ::WriteFile(m_hStdErr, str.data(), str.size(), nullptr, nullptr);
+        ::WriteFile(m_hStdErr, str.data(), static_cast<DWORD>(str.size()), nullptr, nullptr);
     }
 
 private:
diff --git a/src/driver/yamml.cpp b/src/driver/yamml.cpp
index 5cfcb56..1ca9b27 100644
--- a/src/driver/yamml.cpp
+++ b/src/driver/yamml.cpp
@@ -63,7 +63,7 @@ int main(int argc, char** argv)
         std::transform(args.begin(), args.end(), argPointers.begin(), [] (auto&& x) { return &x[0]; });
 
         PO::store(
-            PO::command_line_parser(argPointers.size(), argPointers.data())
+            PO::command_line_parser(static_cast<int>(argPointers.size()), argPointers.data())
             .options(allOptions)
             .positional(positional)
             .style(
diff --git a/src/ir2midi/ir2midi.cpp b/src/ir2midi/ir2midi.cpp
index 94c88dd..47f3c7d 100644
--- a/src/ir2midi/ir2midi.cpp
+++ b/src/ir2midi/ir2midi.cpp
@@ -241,7 +241,7 @@ void IR2MIDICompiler::CompileBlock(int trackNumber, IR::BlockReference blockRef)
 
 void IR2MIDICompiler::Finalize()
 {
-    for (std::size_t i = 0; i < m_MIDI.Tracks.size(); i++)
+    for (int i = 0; i < static_cast<int>(m_MIDI.Tracks.size()); i++)
     {
         GetTrackContext(i).SortEvents();
 
diff --git a/src/parser/action_state_phrase.hpp b/src/parser/action_state_phrase.hpp
index 2c64c34..ef2465a 100644
--- a/src/parser/action_state_phrase.hpp
+++ b/src/parser/action_state_phrase.hpp
@@ -568,8 +568,8 @@ public:
     {
         st.ASTNode.Minor = 0;
 
-        st.ASTNode.Minor += std::count(in.begin(), in.end(), 's');
-        st.ASTNode.Minor -= std::count(in.begin(), in.end(), 'f');
+        st.ASTNode.Minor += static_cast<int>(std::count(in.begin(), in.end(), 's'));
+        st.ASTNode.Minor -= static_cast<int>(std::count(in.begin(), in.end(), 'f'));
     }
 };
 
diff --git a/test/midiwriter/vlvexcepttest.cpp b/test/midiwriter/vlvexcepttest.cpp
index c28a819..199258e 100644
--- a/test/midiwriter/vlvexcepttest.cpp
+++ b/test/midiwriter/vlvexcepttest.cpp
@@ -12,9 +12,18 @@ using namespace YAMML::MIDIWriter;
 
 BOOST_AUTO_TEST_SUITE(VLVExceptTest)
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4702)  // unreachable code
+#endif
+
 BOOST_AUTO_TEST_CASE(Test1)
 {
     BOOST_CHECK_THROW(ToVariableLengthValue(0x80FFFFFF), YAMML::Exceptions::InvalidArgumentException);
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 BOOST_AUTO_TEST_SUITE_END()