diff options
| -rw-r--r-- | STL/ChangeLog | 3 | ||||
| -rw-r--r-- | STL/algobase.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/STL/ChangeLog b/STL/ChangeLog index 17da9fe8db1..4a897ce9208 100644 --- a/STL/ChangeLog +++ b/STL/ChangeLog @@ -1,5 +1,8 @@ Mon Jan 20 10:04:11 1997 David L. Levine <levine@cs.wustl.edu> + * algobase.h: wrapped min/max templates with #if ! defined (VXWORKS) + because it already has them. + * bstring.h: wrapped basic_string<char> template instantiation so that it's not used with GreenHills compiler. diff --git a/STL/algobase.h b/STL/algobase.h index b3f5fbbb697..17816328155 100644 --- a/STL/algobase.h +++ b/STL/algobase.h @@ -48,6 +48,7 @@ inline void swap(T& a, T& b) { b = tmp; } +#if ! defined (VXWORKS) template <class T> inline const T& min(const T& a, const T& b) { return b < a ? b : a; @@ -67,6 +68,7 @@ template <class T, class Compare> inline const T& max(const T& a, const T& b, Compare comp) { return comp(a, b) ? b : a; } +#endif /* VXWORKS */ template <class InputIterator, class Distance> void __distance(InputIterator first, InputIterator last, Distance& n, |