From 6b3ce6286bef0d4d2ec8666923b9371814e501e1 Mon Sep 17 00:00:00 2001 From: "N.N." Date: Tue, 2 Jun 2009 18:48:09 +0000 Subject: fix namespace problem with clip template svn path=/trunk/; revision=11619 --- desiredata/src/desire.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/desiredata/src/desire.h b/desiredata/src/desire.h index 56e0da0a..8d092e44 100644 --- a/desiredata/src/desire.h +++ b/desiredata/src/desire.h @@ -339,9 +339,11 @@ void glob_watchdog(t_pd *dummy); #ifdef __cplusplus #include +// should I remove min,max now? g++ complains about conflict between min and std::min... +// they have the same def. btw i don't know how to refer to my own. template static T min(T a, T b) {return a static T max(T a, T b) {return a>b?a:b;} -template T clip(T a, T b, T c) {return min(max(a,b),c);} +template T clip(T a, T b, T c) {return std::min(std::max(a,b),c);} void oprintf(std::ostream &buf, const char *s, ...); void voprintf(std::ostream &buf, const char *s, va_list args); EXTERN std::ostringstream lost_posts; -- cgit v1.2.1