2
0
mirror of https://github.com/boostorg/ublas.git synced 2026-02-15 01:22:10 +00:00

Regression w.r.t. gcc 2.95.3/stlport fixed.

svn path=/trunk/boost/boost/numeric/ublas/; revision=19558
This commit is contained in:
Jörg Walter
2003-08-12 16:39:33 +00:00
parent 16f6716877
commit 0d8b01b0c6

View File

@@ -1776,10 +1776,12 @@ namespace boost { namespace numeric { namespace ublas {
bool compare(const self_type& rhs) const {
return (v1_ < rhs.v1_);
}
#ifndef BOOST_UBLAS_NO_MEMBER_FRIENDS
BOOST_UBLAS_INLINE
friend bool operator < (const self_type& lhs, const self_type& rhs) {
return lhs.compare(rhs);
}
#endif
private:
size_type i_;
@@ -1787,6 +1789,20 @@ namespace boost { namespace numeric { namespace ublas {
typename V::value2_type v2_;
};
#ifdef BOOST_UBLAS_NO_MEMBER_FRIENDS
template<class V>
BOOST_UBLAS_INLINE
void swap(index_pair<V> lhs, index_pair<V> rhs) {
lhs.swap(rhs);
}
template<class V>
BOOST_UBLAS_INLINE
bool operator < (const index_pair<V>& lhs, const index_pair<V>& rhs) {
return lhs.compare(rhs);
}
#endif
template <class V1, class V2>
class index_pair_array:
private boost::noncopyable {
@@ -1912,10 +1928,12 @@ namespace boost { namespace numeric { namespace ublas {
return ((v1_ < rhs.v1_) ||
(v1_ == rhs.v1_ && v2_ < rhs.v2_));
}
#ifndef BOOST_UBLAS_NO_MEMBER_FRIENDS
BOOST_UBLAS_INLINE
friend bool operator < (const self_type& lhs, const self_type& rhs) {
return lhs.compare(rhs);
}
#endif
private:
size_type i_;
@@ -1924,6 +1942,20 @@ namespace boost { namespace numeric { namespace ublas {
typename M::value3_type v3_;
};
#ifdef BOOST_UBLAS_NO_MEMBER_FRIENDS
template<class M>
BOOST_UBLAS_INLINE
void swap(index_triple<M> lhs, index_triple<M> rhs) {
lhs.swap(rhs);
}
template<class M>
BOOST_UBLAS_INLINE
bool operator < (const index_triple<M>& lhs, const index_triple<M>& rhs) {
return lhs.compare(rhs);
}
#endif
template <class V1, class V2, class V3>
class index_triple_array:
private boost::noncopyable {