[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56686] trunk/blender/extern/libmv/ third_party/glog/src/windows/port.h: Fix libmv build with visual studio 2012.

[Brecht Van Lommel]

Revision: 56686
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56686
Author:   blendix
Date:     2013-05-11 13:10:39 +0000 (Sat, 11 May 2013)
Log Message:
-----------
Fix libmv build with visual studio 2012.

Patch #35158 by Jurgen Herrmann.

Modified Paths:
--------------
    trunk/blender/extern/libmv/third_party/glog/src/windows/port.h

Modified: trunk/blender/extern/libmv/third_party/glog/src/windows/port.h
===================================================================
--- trunk/blender/extern/libmv/third_party/glog/src/windows/port.h	2013-05-11 12:21:33 UTC (rev 56685)
+++ trunk/blender/extern/libmv/third_party/glog/src/windows/port.h	2013-05-11 13:10:39 UTC (rev 56686)
@@ -94,7 +94,10 @@
 #define strncasecmp  _strnicmp
 
 /* In windows-land, hash<> is called hash_compare<> (from xhash.h) */
-#define hash  hash_compare
+/* 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)