From: Nigel Stewart <nigels@users.sourceforge.net>
Date: Mon, 19 Aug 2013 15:58:47 +0000 (-0500)
Subject: Build fixes for VS2013
X-Git-Url: https://git.cworth.org/git?p=apitrace;a=commitdiff_plain;h=b9c20609ce007c6e07562df57b8a5d845061b9e4

Build fixes for VS2013

https://github.com/p3/regal/pull/97

Signed-off-by: José Fonseca <jfonseca@vmware.com>
---

diff --git a/common/formatter.hpp b/common/formatter.hpp
index 75a407f..55ed28a 100644
--- a/common/formatter.hpp
+++ b/common/formatter.hpp
@@ -153,9 +153,9 @@ public:
     WindowsAttribute(WORD _wAttributes) : wAttributes(_wAttributes) {}
     void apply(std::ostream& os) const {
         DWORD nStdHandleOutput;
-        if (os == std::cout) {
+        if (&os == &std::cout) {
             nStdHandleOutput = STD_OUTPUT_HANDLE;
-        } else if (os == std::cerr) {
+        } else if (&os == &std::cerr) {
             nStdHandleOutput = STD_ERROR_HANDLE;
         } else {
             return;
diff --git a/common/trace_file_snappy.cpp b/common/trace_file_snappy.cpp
index 68673c6..41d86ea 100644
--- a/common/trace_file_snappy.cpp
+++ b/common/trace_file_snappy.cpp
@@ -54,6 +54,7 @@
 #include <snappy.h>
 
 #include <iostream>
+#include <algorithm>
 
 #include <assert.h>
 #include <string.h>