Revision: 8714
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8714&view=rev
Author: mdboom
Date: 2010-09-21 20:18:48 +0000 (Tue, 21 Sep 2010)
Log Message:
-----------
Bug #
Modified Paths:
--------------
branches/v1_0_maint/lib/matplotlib/tri/_tri.cpp
branches/v1_0_maint/src/mplutils.h
Modified: branches/v1_0_maint/lib/matplotlib/tri/_tri.cpp
===================================================================
--- branches/v1_0_maint/lib/matplotlib/tri/_tri.cpp 2010-09-21 20:16:28 UTC
(rev 8713)
+++ branches/v1_0_maint/lib/matplotlib/tri/_tri.cpp 2010-09-21 20:18:48 UTC
(rev 8714)
@@ -559,10 +559,10 @@
// 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);
}
}
Modified: branches/v1_0_maint/src/mplutils.h
===================================================================
--- branches/v1_0_maint/src/mplutils.h 2010-09-21 20:16:28 UTC (rev 8713)
+++ branches/v1_0_maint/src/mplutils.h 2010-09-21 20:18:48 UTC (rev 8714)
@@ -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 @@
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
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
