[openMSX-commits] [SCM] openMSX (main) branch master updated. RELEASE_0_9_1-609-g231874e

[Wouter V. <m97...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "openMSX (main)".

The branch, master has been updated
       via  231874e4b170329de908aa8a8d3ef917caa2d2a2 (commit)
      from  b2d4b3ae59217598440e9bacaa3413f83022fda3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 231874e4b170329de908aa8a8d3ef917caa2d2a2
Author: wouter <ver...@gm...>
Date:   Fri Oct 18 13:47:02 2013 +0200

    Added missing #includes for vs2013
    
    Vampier compiled openMSX with vs2013 and send me the error log. All errors were
    because we used std::min/max without #include <algorithm>. This patch adds
    those missing includes. (So it only worked by accident with gcc/clang/vs2012).
    
    This patch also fixes one vs compiler warning. There are more, but those aren't
    as trivial to fix.

-----------------------------------------------------------------------

Summary of changes:
 src/IPSPatch.cc           |    1 +
 src/commands/TclParser.cc |    1 +
 src/input/Touchpad.cc     |    3 ++-
 src/utils/Base64.cc       |    1 +
 src/utils/HexDump.cc      |    1 +
 5 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/IPSPatch.cc b/src/IPSPatch.cc
index 8ae8e2c..46a7fb6 100644
--- a/src/IPSPatch.cc
+++ b/src/IPSPatch.cc
@@ -2,6 +2,7 @@
 #include "File.hh"
 #include "Filename.hh"
 #include "MSXException.hh"
+#include <algorithm>
 #include <cstring>
 #include <cassert>
 
diff --git a/src/commands/TclParser.cc b/src/commands/TclParser.cc
index a0b2623..a8531c9 100644
--- a/src/commands/TclParser.cc
+++ b/src/commands/TclParser.cc
@@ -1,5 +1,6 @@
 #include "TclParser.hh"
 #include "ScopedAssign.hh"
+#include <algorithm>
 #include <iostream>
 #include <cassert>
 #include <cstdlib>
diff --git a/src/input/Touchpad.cc b/src/input/Touchpad.cc
index 79d8844..39e3e6f 100644
--- a/src/input/Touchpad.cc
+++ b/src/input/Touchpad.cc
@@ -255,7 +255,8 @@ void Touchpad::signalEvent(const shared_ptr<const Event>& event,
 		hostButtons = b;
 		createTouchpadStateChange(
 			time, hostX, hostY,
-			hostButtons & 1, hostButtons & 2);
+			(hostButtons & 1) != 0,
+			(hostButtons & 2) != 0);
 	}
 }
 
diff --git a/src/utils/Base64.cc b/src/utils/Base64.cc
index d12b2d6..5a45e52 100644
--- a/src/utils/Base64.cc
+++ b/src/utils/Base64.cc
@@ -1,5 +1,6 @@
 #include "Base64.hh"
 #include "xrange.hh"
+#include <algorithm>
 #include <cassert>
 
 namespace Base64 {
diff --git a/src/utils/HexDump.cc b/src/utils/HexDump.cc
index 4f3ca1f..7626c2e 100644
--- a/src/utils/HexDump.cc
+++ b/src/utils/HexDump.cc
@@ -1,4 +1,5 @@
 #include "HexDump.hh"
+#include <algorithm>
 
 namespace HexDump {
 


hooks/post-receive
-- 
openMSX (main)