From 7ed5e4da65d2c0df63a08b1e1f4b4de1855f1bf0 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sat, 11 May 2013 20:33:54 +0600 Subject: [PATCH] Fix compilation error with msvc2012 Using change from glog's upstream for this. --- src/third_party/glog/src/windows/port.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/third_party/glog/src/windows/port.h b/src/third_party/glog/src/windows/port.h index 72e3906f..e3e76ec2 100644 --- a/src/third_party/glog/src/windows/port.h +++ b/src/third_party/glog/src/windows/port.h @@ -94,7 +94,10 @@ enum { STDIN_FILENO = 0, STDOUT_FILENO = 1, STDERR_FILENO = 2 }; #define strncasecmp _strnicmp /* In windows-land, hash<> is called hash_compare<> (from xhash.h) */ +/* VC11 provides std::hash */ +#if defined(_MSC_VER) && (_MSC_VER < 1700) #define hash hash_compare +#endif /* Sleep is in ms, on windows */ #define sleep(secs) Sleep((secs) * 1000)