[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50530] trunk/blender/extern/libmv/ third_party/ceres/internal/ceres/collections_port.h: Fix build error with gcc 4.7 in last commit.

[Brecht Van Lommel]

Revision: 50530
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50530
Author:   blendix
Date:     2012-09-11 12:19:43 +0000 (Tue, 11 Sep 2012)
Log Message:
-----------
Fix build error with gcc 4.7 in last commit.

Modified Paths:
--------------
    trunk/blender/extern/libmv/third_party/ceres/internal/ceres/collections_port.h

Modified: trunk/blender/extern/libmv/third_party/ceres/internal/ceres/collections_port.h
===================================================================
--- trunk/blender/extern/libmv/third_party/ceres/internal/ceres/collections_port.h	2012-09-11 11:54:10 UTC (rev 50529)
+++ trunk/blender/extern/libmv/third_party/ceres/internal/ceres/collections_port.h	2012-09-11 12:19:43 UTC (rev 50530)
@@ -124,7 +124,11 @@
 
 // Hasher for STL pairs. Requires hashers for both members to be defined.
 template<typename T>
+#ifdef CERES_HASH_BOOST
 struct hash {
+#else
+struct hash<pair<T, T> > {
+#endif
   size_t operator()(const pair<T, T>& p) const {
     size_t h1 = hash<T>()(p.first);
     size_t h2 = hash<T>()(p.second);