diff options
| author | astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675> | 2011-05-14 16:24:05 +0000 |
|---|---|---|
| committer | astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675> | 2011-05-14 16:24:05 +0000 |
| commit | 20c287b91345e348cc00b8a0da53ff967be0cac9 (patch) | |
| tree | bb7e94af454869e9d17dc133862bb35a564c76b3 /misc | |
| parent | 8478361c99b641f8a060578db49626e21aa6e1d3 (diff) | |
| download | opt-utilities-20c287b91345e348cc00b8a0da53ff967be0cac9.tar.bz2 | |
git-svn-id: file:///home/svn/opt_utilities@197 ed2142bd-67ad-457f-ba7c-d818d4011675
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/optvec.hpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/misc/optvec.hpp b/misc/optvec.hpp index e52e853..7967e5c 100644 --- a/misc/optvec.hpp +++ b/misc/optvec.hpp @@ -53,7 +53,7 @@ namespace opt_utilities optvec<T> operator+(const optvec<T>& x1,const optvec<T>& x2) { - optvec<T> result(min(x1.size(),x2.size())); + optvec<T> result(std::min(x1.size(),x2.size())); for(size_t i=0;i!=result.size();++i) { result[i]=x1[i]+x2[i]; @@ -76,7 +76,7 @@ namespace opt_utilities template<typename T> optvec<T>& operator+=(optvec<T>& x1,const optvec<T>& x2) { - for(size_t i=0;i!=min(x1.size(),x2.size());++i) + for(size_t i=0;i!=std::min(x1.size(),x2.size());++i) { x1[i]+=x2[i]; } @@ -87,7 +87,7 @@ namespace opt_utilities optvec<T> operator-(const optvec<T>& x1,const optvec<T>& x2) { - optvec<T> result(min(x1.size(),x2.size())); + optvec<T> result(std::min(x1.size(),x2.size())); for(size_t i=0;i!=result.size();++i) { result[i]=x1[i]-x2[i]; @@ -123,7 +123,7 @@ namespace opt_utilities template<typename T> optvec<T>& operator-=(optvec<T>& x1,const optvec<T>& x2) { - for(size_t i=0;i!=min(x1.size(),x2.size());++i) + for(size_t i=0;i!=std::min(x1.size(),x2.size());++i) { x1[i]-=x2[i]; } @@ -134,7 +134,7 @@ namespace opt_utilities optvec<T> operator*(const optvec<T>& x1,const optvec<T>& x2) { - optvec<T> result(min(x1.size(),x2.size())); + optvec<T> result(std::min(x1.size(),x2.size())); for(size_t i=0;i!=result.size();++i) { result[i]=x1[i]*x2[i]; @@ -170,7 +170,7 @@ namespace opt_utilities template<typename T> optvec<T>& operator*=(optvec<T>& x1,const optvec<T>& x2) { - for(size_t i=0;i!=min(x1.size(),x2.size());++i) + for(size_t i=0;i!=std::min(x1.size(),x2.size());++i) { x1[i]*=x2[i]; } @@ -192,7 +192,7 @@ namespace opt_utilities optvec<T> operator/(const optvec<T>& x1,const optvec<T>& x2) { - optvec<T> result(min(x1.size(),x2.size())); + optvec<T> result(std::min(x1.size(),x2.size())); for(size_t i=0;i!=result.size();++i) { result[i]=x1[i]/x2.at(i); @@ -227,7 +227,7 @@ namespace opt_utilities template<typename T> optvec<T>& operator/=(optvec<T>& x1,const optvec<T>& x2) { - for(size_t i=0;i!=min(x1.size(),x2.size());++i) + for(size_t i=0;i!=std::min(x1.size(),x2.size());++i) { x1[i]/=x2.at(i); } @@ -258,7 +258,7 @@ namespace opt_utilities template<typename T> bool operator<(const optvec<T>& x1,const optvec<T>& x2) { - for(size_t i=0;i!=min(x1.size(),x2.size());++i) + for(size_t i=0;i!=std::min(x1.size(),x2.size());++i) { if(x1[i]!=x2[i]) { |