diff --git a/goldlib/gall/gdefs.h b/goldlib/gall/gdefs.h index 8f1c421..135585d 100644 --- a/goldlib/gall/gdefs.h +++ b/goldlib/gall/gdefs.h @@ -118,13 +118,8 @@ typedef int (*StdCmpCP)(const void*, const void*); template inline bool in_range(T a, T b, T c) { return (a >= b) and (a <= c); } template inline T absolute(T a) { return a < 0 ? -a : a; } template inline int compare_two(T a, T b) { return a < b ? -1 : a > b ? 1 : 0; } -#ifdef __GNUC__ -template inline T minimum_of_two(T a, T b) { return __extension__ (a inline T maximum_of_two(T a, T b) { return __extension__ (a >? b); } -#else template inline T minimum_of_two(T a, T b) { return (a < b) ? a : b; } template inline T maximum_of_two(T a, T b) { return (a > b) ? a : b; } -#endif template inline int zero_or_one(T e) { return e ? 1 : 0; } template inline bool make_bool(T a) { return a ? true : false; }