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 75a407f7469ee421f3cde1c9bc8b7e4a68a4772d..55ed28abec1501d19c909dfe0be544b983941319 100644 (file)
--- 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 68673c6324ef5e28a9f0b79cf0f4e54f53bdcb63..41d86ea00ded834e33dadd3a3ca65c5d5ef7da63 100644 (file)
--- 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>