Bug #

mdboom · mdboom · commit b37fefdeb026 · 2010-09-21T20:18:48.000Z
svn path=/branches/v1_0_maint/; revision=8714
diff --git a/lib/matplotlib/tri/_tri.cpp b/lib/matplotlib/tri/_tri.cpp
@@ -559,10 +559,10 @@ void TriContourGenerator::clear_visited_flags(bool include_boundaries)
         // Clear _boundaries_visited.
         for (BoundariesVisited::iterator it = _boundaries_visited.begin();
                 it != _boundaries_visited.end(); ++it)
-            fill(it->begin(), it->end(), false);
+            std::fill(it->begin(), it->end(), false);
 
         // Clear _boundaries_used.
-        fill(_boundaries_used.begin(), _boundaries_used.end(), false);
+        std::fill(_boundaries_used.begin(), _boundaries_used.end(), false);
     }
 }
 
diff --git a/src/mplutils.h b/src/mplutils.h
@@ -1,4 +1,4 @@
-/* mplutils.h	--
+/* mplutils.h   --
  *
  * $Header$
  * $Log$
@@ -20,7 +20,7 @@
 void _VERBOSE(const std::string&);
 
 
-#undef	CLAMP
+#undef  CLAMP
 #define CLAMP(x, low, high)  (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
 
 #undef  MAX
@@ -45,4 +45,27 @@ public :
     friend std::ostream &operator <<(std::ostream &, const Printf &);
 };
 
+#if defined(_MSC_VER) && (_MSC_VER == 1400)
+
+/* Required by libpng and zlib */
+#pragma comment(lib, "bufferoverflowU")
+
+/* std::max and std::min are missing in Windows Server 2003 R2
+   Platform SDK compiler.  See matplotlib bug #3067191 */
+namespace std {
+
+    template <class T> inline T max(const T& a, const T& b)
+    {
+        return (a > b) ? a : b;
+    }
+
+    template <class T> inline T min(const T& a, const T& b)
+    {
+        return (a < b) ? a : b;
+    }
+
+}
+
+#endif
+
 #endif

Original file line number	Diff line number	Diff line change
`@@ -559,10 +559,10 @@ void TriContourGenerator::clear_visited_flags(bool include_boundaries)`
`559`	`559`	`// Clear _boundaries_visited.`
`560`	`560`	`for (BoundariesVisited::iterator it = _boundaries_visited.begin();`
`561`	`561`	`it != _boundaries_visited.end(); ++it)`
`562`		`- fill(it->begin(), it->end(), false);`
	`562`	`+ std::fill(it->begin(), it->end(), false);`
`563`	`563`
`564`	`564`	`// Clear _boundaries_used.`
`565`		`- fill(_boundaries_used.begin(), _boundaries_used.end(), false);`
	`565`	`+ std::fill(_boundaries_used.begin(), _boundaries_used.end(), false);`
`566`	`566`	`}`
`567`	`567`	`}`
`568`	`568`