[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] rev 2219 - in trunk/src: . editor
From: |
Kenneth Gangstoe |
Subject: |
[Pingus-CVS] rev 2219 - in trunk/src: . editor |
Date: |
Tue, 06 Apr 2004 09:55:18 +0200 |
Author: sphair
Date: 2004-04-06 09:55:17 +0200 (Tue, 06 Apr 2004)
New Revision: 2219
Modified:
trunk/src/editor/surface_selector.hxx
trunk/src/math.hxx
Log:
- Fixed namespace problem with XMLHelper and std::cout
- Fixed namespace problem in surface selector
- Fixed template problem with min/max
Modified: trunk/src/editor/surface_selector.hxx
===================================================================
--- trunk/src/editor/surface_selector.hxx 2004-04-06 03:13:53 UTC (rev
2218)
+++ trunk/src/editor/surface_selector.hxx 2004-04-06 07:55:17 UTC (rev
2219)
@@ -28,6 +28,7 @@
class CL_Font;
namespace Pingus {
+namespace EditorNS {
struct surface_obj
{
@@ -78,6 +79,7 @@
SurfaceSelector& operator= (const SurfaceSelector&);
};
+} // namespace EditorNS
} // namespace Pingus
#endif
Modified: trunk/src/math.hxx
===================================================================
--- trunk/src/math.hxx 2004-04-06 03:13:53 UTC (rev 2218)
+++ trunk/src/math.hxx 2004-04-06 07:55:17 UTC (rev 2219)
@@ -35,6 +35,14 @@
const double pi = 3.14159265358979323846; /* pi */
const double pi_2 = 1.57079632679489661923; /* pi/2 */
+// Win32 defines these are defines already, so we have to undef them
+#ifdef min
+#undef min
+#endif
+#ifdef max
+#undef max
+#endif
+
template<class T>
T min (const T& a, const T& b)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] rev 2219 - in trunk/src: . editor,
Kenneth Gangstoe <=