From 988a2f7a5c88aff02fcb137308507ef35a3ff22e Mon Sep 17 00:00:00 2001 From: dooglus Date: Fri, 28 Sep 2007 15:19:39 +0000 Subject: [PATCH] Use std::min and std::max rather than my ad-hoc #defines. git-svn-id: http://svn.voria.com/code@795 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/synfig/valuenode_range.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/synfig-core/trunk/src/synfig/valuenode_range.cpp b/synfig-core/trunk/src/synfig/valuenode_range.cpp index 40104d0..dfc6adc 100644 --- a/synfig-core/trunk/src/synfig/valuenode_range.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_range.cpp @@ -110,10 +110,6 @@ synfig::ValueNode_Range::~ValueNode_Range() unlink_all(); } -#define min(x,y) (x>y ? y : x) -#define max(x,y) (x>y ? x : y) -#define range(low,high,input) (min(high,max(low,input))) - synfig::ValueBase synfig::ValueNode_Range::operator()(Time t)const { @@ -138,11 +134,11 @@ synfig::ValueNode_Range::operator()(Time t)const return maximum; } case ValueBase::TYPE_INTEGER: - return range((*min_)(t).get(int()), (*max_)(t).get(int()), (*link_)(t).get(int())); + return std::max((*min_)(t).get(int()), std::min((*max_)(t).get(int()), (*link_)(t).get(int()))); case ValueBase::TYPE_REAL: - return range((*min_)(t).get(Real()), (*max_)(t).get(Real()), (*link_)(t).get(Real())); + return std::max((*min_)(t).get(Real()), std::min((*max_)(t).get(Real()), (*link_)(t).get(Real()))); case ValueBase::TYPE_TIME: - return range((*min_)(t).get(Time()), (*max_)(t).get(Time()), (*link_)(t).get(Time())); + return std::max((*min_)(t).get(Time()), std::min((*max_)(t).get(Time()), (*link_)(t).get(Time()))); default: assert(0); break; -- 2.7.4