Compiler warning

rauchg · Dec 30, 2010 · 9b7676c · 9b7676c
1 parent 0830dde
commit 9b7676c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/db/dur_commitjob.h b/db/dur_commitjob.h
@@ -43,7 +43,7 @@ namespace mongo {
 
             void* start() const { return (char*)p - len; }
             void* end() const { return p; }
-            int length() const { return len; }
+            unsigned length() const { return len; }
 
             bool operator < (const WriteIntent& rhs) const { return end() < rhs.end(); }
 

diff --git a/db/dur_preplogbuffer.cpp b/db/dur_preplogbuffer.cpp
@@ -69,7 +69,7 @@ namespace mongo {
             i->w_ptr = ((char*)mmf->view_write()) + ofs;
 
             JEntry e;
-            e.len = min((unsigned long long)i->length(), mmf->length() - ofs); //dont write past end of file
+            e.len = min(i->length(), (unsigned)(mmf->length() - ofs)); //dont write past end of file
             assert( ofs <= 0x80000000 );
             e.ofs = (unsigned) ofs;
             e.setFileNo( mmf->fileSuffixNo() );