diff options
| -rw-r--r-- | indra/llcommon/llunittype.h | 24 | 
1 files changed, 12 insertions, 12 deletions
| diff --git a/indra/llcommon/llunittype.h b/indra/llcommon/llunittype.h index 50037ccade..5cf41343fc 100644 --- a/indra/llcommon/llunittype.h +++ b/indra/llcommon/llunittype.h @@ -287,78 +287,78 @@ struct LLUnitImplicit : public LLUnit<STORAGE_TYPE, UNITS>  	template<typename OTHER_STORAGE_TYPE, typename OTHER_UNITS>  	LL_FORCE_INLINE bool operator == (LLUnitImplicit<OTHER_STORAGE_TYPE, OTHER_UNITS> other) const  	{ -		return mValue == convert(other).value(); +		return base_t::mValue == convert(other).value();  	}  	template<typename STORAGE_T>  	LL_FORCE_INLINE bool operator == (STORAGE_T other) const  	{ -		return mValue == other; +		return base_t::mValue == other;  	}  	using base_t::operator !=;  	template<typename OTHER_STORAGE_TYPE, typename OTHER_UNITS>  	LL_FORCE_INLINE bool operator != (LLUnitImplicit<OTHER_STORAGE_TYPE, OTHER_UNITS> other) const  	{ -		return mValue != convert(other).value(); +		return base_t::mValue != convert(other).value();  	}  	template<typename STORAGE_T>  	LL_FORCE_INLINE bool operator != (STORAGE_T other) const  	{ -		return mValue != other; +		return base_t::mValue != other;  	}  	using base_t::operator <;  	template<typename OTHER_STORAGE_TYPE, typename OTHER_UNITS>  	LL_FORCE_INLINE bool operator < (LLUnitImplicit<OTHER_STORAGE_TYPE, OTHER_UNITS> other) const  	{ -		return mValue < convert(other).value(); +		return base_t::mValue < convert(other).value();  	}  	template<typename STORAGE_T>  	LL_FORCE_INLINE bool operator < (STORAGE_T other) const  	{ -		return mValue < other; +		return base_t::mValue < other;  	}  	using base_t::operator <=;  	template<typename OTHER_STORAGE_TYPE, typename OTHER_UNITS>  	LL_FORCE_INLINE bool operator <= (LLUnitImplicit<OTHER_STORAGE_TYPE, OTHER_UNITS> other) const  	{ -		return mValue <= convert(other).value(); +		return base_t::mValue <= convert(other).value();  	}  	template<typename STORAGE_T>  	LL_FORCE_INLINE bool operator <= (STORAGE_T other) const  	{ -		return mValue <= other; +		return base_t::mValue <= other;  	}  	using base_t::operator >;  	template<typename OTHER_STORAGE_TYPE, typename OTHER_UNITS>  	LL_FORCE_INLINE bool operator > (LLUnitImplicit<OTHER_STORAGE_TYPE, OTHER_UNITS> other) const  	{ -		return mValue > convert(other).value(); +		return base_t::mValue > convert(other).value();  	}  	template<typename STORAGE_T>  	LL_FORCE_INLINE bool operator > (STORAGE_T other) const  	{ -		return mValue > other; +		return base_t::mValue > other;  	}  	using base_t::operator >=;  	template<typename OTHER_STORAGE_TYPE, typename OTHER_UNITS>  	LL_FORCE_INLINE bool operator >= (LLUnitImplicit<OTHER_STORAGE_TYPE, OTHER_UNITS> other) const  	{ -		return mValue >= convert(other).value(); +		return base_t::mValue >= convert(other).value();  	}  	template<typename STORAGE_T>  	LL_FORCE_INLINE bool operator >= (STORAGE_T other) const  	{ -		return mValue >= other; +		return base_t::mValue >= other;  	}  }; | 
