From 0763626b1d5a396a8d78985c9a445763686f92f8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 12:45:50 +0100 Subject: Merging upstream version 1.16~pre2. Signed-off-by: Daniel Baumann --- file_index.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'file_index.h') diff --git a/file_index.h b/file_index.h index 8acb60f..7fee1e6 100644 --- a/file_index.h +++ b/file_index.h @@ -76,7 +76,7 @@ public: explicit File_index( const int infd ); File_index( const std::vector< int > & infd_vector, const long long fsize ); - int members() const { return member_vector.size(); } + long members() const { return member_vector.size(); } const std::string & error() const { return error_; } int retval() const { return retval_; } @@ -84,7 +84,7 @@ public: { if( retval_ || fi.retval_ || isize != fi.isize || member_vector.size() != fi.member_vector.size() ) return false; - for( unsigned i = 0; i < member_vector.size(); ++i ) + for( unsigned long i = 0; i < member_vector.size(); ++i ) if( member_vector[i] != fi.member_vector[i] ) return false; return true; } @@ -102,8 +102,8 @@ public: long long file_size() const { if( isize >= 0 ) return isize; else return 0; } - const Block & dblock( const int i ) const + const Block & dblock( const long i ) const { return member_vector[i].dblock; } - const Block & mblock( const int i ) const + const Block & mblock( const long i ) const { return member_vector[i].mblock; } }; -- cgit v1.2.3