Merge branch 'master' of github.com:linbox-team/fflas-ffpack

linbox-team · Jul 29, 2016 · 44accf2 · 44accf2
2 parents 0a6c5ec + fe30877
commit 44accf2
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/fflas-ffpack/fflas/fflas_helpers.inl b/fflas-ffpack/fflas/fflas_helpers.inl
@@ -58,12 +58,12 @@ namespace FFLAS {
 		template <> inline size_t min_types(double& k) {return static_cast<size_t>(std::min(k,double(std::numeric_limits<size_t>::max())));}
 		template <> inline size_t min_types(int64_t& k) {return static_cast<size_t>(std::min(k,int64_t(std::numeric_limits<size_t>::max())));}
 #endif
-		template <> inline size_t min_types(RecInt::rint<6>& k) {return static_cast<size_t>(std::min(k,RecInt::rint<6>(uint64_t(std::numeric_limits<size_t>::max()))));}
-		template <> inline size_t min_types(RecInt::rint<7>& k) {return static_cast<size_t>(std::min(k,RecInt::rint<7>(uint64_t(std::numeric_limits<size_t>::max()))));}
-		template <> inline size_t min_types(RecInt::rint<8>& k) {return static_cast<size_t>(std::min(k,RecInt::rint<8>(uint64_t(std::numeric_limits<size_t>::max()))));}
-		template <> inline size_t min_types(RecInt::rint<9>& k) {return static_cast<size_t>(std::min(k,RecInt::rint<9>(uint64_t(std::numeric_limits<size_t>::max()))));}
-		template <> inline size_t min_types(RecInt::rint<10>& k) {return static_cast<size_t>(std::min(k,RecInt::rint<10>(uint64_t(std::numeric_limits<size_t>::max()))));}
-		template <> inline size_t min_types(Givaro::Integer& k) {return static_cast<size_t>(std::min(k,Givaro::Integer(uint64_t(std::numeric_limits<size_t>::max()))));}
+		template <> inline size_t min_types(RecInt::rint<6>& k) {return static_cast<size_t>(uint64_t(std::min(k,RecInt::rint<6>(uint64_t(std::numeric_limits<size_t>::max())))));}
+		template <> inline size_t min_types(RecInt::rint<7>& k) {return static_cast<size_t>(uint64_t(std::min(k,RecInt::rint<7>(uint64_t(std::numeric_limits<size_t>::max())))));}
+		template <> inline size_t min_types(RecInt::rint<8>& k) {return static_cast<size_t>(uint64_t(std::min(k,RecInt::rint<8>(uint64_t(std::numeric_limits<size_t>::max())))));}
+		template <> inline size_t min_types(RecInt::rint<9>& k) {return static_cast<size_t>(uint64_t(std::min(k,RecInt::rint<9>(uint64_t(std::numeric_limits<size_t>::max())))));}
+		template <> inline size_t min_types(RecInt::rint<10>& k) {return static_cast<size_t>(uint64_t(std::min(k,RecInt::rint<10>(uint64_t(std::numeric_limits<size_t>::max())))));}
+		template <> inline size_t min_types(Givaro::Integer& k) {return static_cast<size_t>(uint64_t(std::min(k,Givaro::Integer(uint64_t(std::numeric_limits<size_t>::max())))));}
 
 		template <class T>
 		inline bool unfit(T x){return false;}