diff options
author | Mike Buland <eichlan@xagasoft.com> | 2008-09-24 19:31:37 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2008-09-24 19:31:37 +0000 |
commit | 1ca201c4151ce6e4ac4921c641fec7d21d64752c (patch) | |
tree | c8e6a63ec39a979fa8706284b43efd5b2d69e17f /src/fstring.h | |
parent | dea750e9470f1be61f8afd3eb0ee45a57ed4976a (diff) | |
download | libbu++-1ca201c4151ce6e4ac4921c641fec7d21d64752c.tar.gz libbu++-1ca201c4151ce6e4ac4921c641fec7d21d64752c.tar.bz2 libbu++-1ca201c4151ce6e4ac4921c641fec7d21d64752c.tar.xz libbu++-1ca201c4151ce6e4ac4921c641fec7d21d64752c.zip |
Something may be wrong.
Diffstat (limited to 'src/fstring.h')
-rw-r--r-- | src/fstring.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/fstring.h b/src/fstring.h index bc23e57..167c055 100644 --- a/src/fstring.h +++ b/src/fstring.h | |||
@@ -21,10 +21,6 @@ | |||
21 | #include "bu/hash.h" | 21 | #include "bu/hash.h" |
22 | #include "bu/util.h" | 22 | #include "bu/util.h" |
23 | 23 | ||
24 | #ifndef min | ||
25 | #define min( a, b ) ((a<b)?(a):(b)) | ||
26 | #endif | ||
27 | |||
28 | namespace Bu | 24 | namespace Bu |
29 | { | 25 | { |
30 | template< typename chr > | 26 | template< typename chr > |
@@ -1070,6 +1066,7 @@ namespace Bu | |||
1070 | } | 1066 | } |
1071 | 1067 | ||
1072 | #ifdef BU_TRACE | 1068 | #ifdef BU_TRACE |
1069 | template<typename t> void __tracer_format( const t &v ); | ||
1073 | template<> void __tracer_format<FString>( const FString &v ); | 1070 | template<> void __tracer_format<FString>( const FString &v ); |
1074 | #endif | 1071 | #endif |
1075 | } | 1072 | } |