浏览代码

Fixed compile warning/error with mingw32

Tatsuhiro Tsujikawa 14 年之前
父节点
当前提交
3637291c22
共有 3 个文件被更改,包括 4 次插入5 次删除
  1. 1 1
      src/DHTRoutingTableSerializer.cc
  2. 1 2
      src/FtpDownloadCommand.cc
  3. 2 2
      test/FallocFileAllocationIteratorTest.cc

+ 1 - 1
src/DHTRoutingTableSerializer.cc

@@ -138,7 +138,7 @@ void DHTRoutingTableSerializer::serialize(const std::string& filename)
     // clen bytes compact peer
     WRITE_CHECK(fp, compactPeer, static_cast<size_t>(clen));
     // 24-clen bytes reserved
-    WRITE_CHECK(fp, zero, 24-clen);
+    WRITE_CHECK(fp, zero, static_cast<size_t>(24-clen));
     // 20bytes: node ID
     WRITE_CHECK(fp, node->getID(), DHT_ID_LENGTH);
     // 4bytes reserved

+ 1 - 2
src/FtpDownloadCommand.cc

@@ -68,8 +68,7 @@ FtpDownloadCommand::~FtpDownloadCommand() {}
 bool FtpDownloadCommand::prepareForNextSegment()
 {
   if(getOption()->getAsBool(PREF_FTP_REUSE_CONNECTION) &&
-     static_cast<uint64_t>
-     (getFileEntry()->gtoloff(getSegments().front()->getPositionToWrite())) ==
+     getFileEntry()->gtoloff(getSegments().front()->getPositionToWrite()) ==
      getFileEntry()->getLength()) {
     Command* command = new FtpFinishDownloadCommand
       (getCuid(), getRequest(), getFileEntry(), getRequestGroup(),

+ 2 - 2
test/FallocFileAllocationIteratorTest.cc

@@ -35,7 +35,7 @@ void FallocFileAllocationIteratorTest::testAllocate()
   of.close();
 
   File f(fn);
-  CPPUNIT_ASSERT_EQUAL((uint64_t)10, f.size());
+  CPPUNIT_ASSERT_EQUAL((off_t)10, f.size());
 
   DefaultDiskWriter writer(fn);
   int64_t offset = 10;
@@ -48,7 +48,7 @@ void FallocFileAllocationIteratorTest::testAllocate()
   itr.allocateChunk();
   CPPUNIT_ASSERT(itr.finished());
 
-  CPPUNIT_ASSERT_EQUAL((uint64_t)40960, f.size());
+  CPPUNIT_ASSERT_EQUAL((off_t)40960, f.size());
 #endif // !HAVE_FALLOCATE
 }