aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid <david@xagasoft.com>2010-11-24 20:21:43 +0000
committerDavid <david@xagasoft.com>2010-11-24 20:21:43 +0000
commitf0b91dd739ede9b0ec56fc4639acb94137eea76c (patch)
tree7476921a0b84db014ccd6965ec89d270eed35bd3 /src
parentaefab051dd21df0123ffa45a5a28d594bfecf82d (diff)
downloadlibbu++-f0b91dd739ede9b0ec56fc4639acb94137eea76c.tar.gz
libbu++-f0b91dd739ede9b0ec56fc4639acb94137eea76c.tar.bz2
libbu++-f0b91dd739ede9b0ec56fc4639acb94137eea76c.tar.xz
libbu++-f0b91dd739ede9b0ec56fc4639acb94137eea76c.zip
david - some mix of qt or mingw or something has a min and max macro that conflict with this file... #undefed them for now, figure out better solution later
Diffstat (limited to '')
-rw-r--r--src/util.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/util.h b/src/util.h
index 4fe9eb5..803c49f 100644
--- a/src/util.h
+++ b/src/util.h
@@ -39,6 +39,11 @@ namespace Bu
39 b = tmp; 39 b = tmp;
40 } 40 }
41 41
42#ifdef WIN32
43 #warning: removing min and max win32 macros because of compile conflict
44 #undef min
45 #undef max
46#endif
42 /** 47 /**
43 * Finds the lesser of the two objects, objects passed in must be 48 * Finds the lesser of the two objects, objects passed in must be
44 * less-than-comparable. 49 * less-than-comparable.
@@ -90,7 +95,7 @@ namespace Bu
90 { 95 {
91 return b<a?a:b; 96 return b<a?a:b;
92 } 97 }
93 98
94 /** 99 /**
95 * Given three objects this finds the one between the other two. 100 * Given three objects this finds the one between the other two.
96 *@param a A value to test. 101 *@param a A value to test.