From: Roger Meier <roger@apache.org>
Date: Thu, 4 Aug 2011 21:23:27 +0000 (+0000)
Subject: THRIFT-916 remove i64 => fix build and compile without warning on CI
X-Git-Tag: 0.7.0~8
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=52e751d13799c5b170ebe44aff5635bb32ee2bc4;p=common%2Fthrift.git

THRIFT-916 remove i64 => fix build and compile without warning on CI

git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1154022 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/lib/cpp/src/transport/TFileTransport.cpp b/lib/cpp/src/transport/TFileTransport.cpp
index 98454362..76ef5bdd 100644
--- a/lib/cpp/src/transport/TFileTransport.cpp
+++ b/lib/cpp/src/transport/TFileTransport.cpp
@@ -741,15 +741,9 @@ bool TFileTransport::isEventCorrupted() {
   } else if( ((offset_ + readState_.bufferPtr_ - 4)/chunkSize_) !=
              ((offset_ + readState_.bufferPtr_ + readState_.event_->eventSize_ - 1)/chunkSize_) ) {
     // 3. size indicates that event crosses chunk boundary
-#ifdef __ia64__
-    T_ERROR("Read corrupt event. Event crosses chunk boundary. Event size:%u  Offset:%ld",
+    T_ERROR("Read corrupt event. Event crosses chunk boundary. Event size:%u  Offset:%lu",
             readState_.event_->eventSize_,
-            (int64_t) (offset_ + readState_.bufferPtr_ + 4));
-#else
-    T_ERROR("Read corrupt event. Event crosses chunk boundary. Event size:%u  Offset:%lld",
-            readState_.event_->eventSize_,
-            (int64_t) (offset_ + readState_.bufferPtr_ + 4));
-#endif
+            (offset_ + readState_.bufferPtr_ + 4));
 
     return true;
   }
@@ -789,13 +783,8 @@ void TFileTransport::performRecovery() {
       readState_.resetState(readState_.lastDispatchPtr_);
       currentEvent_ = NULL;
       char errorMsg[1024];
-#ifdef __ia64__
-      sprintf(errorMsg, "TFileTransport: log file corrupted at offset: %ld",
-              (int64_t) (offset_ + readState_.lastDispatchPtr_));
-#else
-      sprintf(errorMsg, "TFileTransport: log file corrupted at offset: %lld",
-              (int64_t) (offset_ + readState_.lastDispatchPtr_));
-#endif
+      sprintf(errorMsg, "TFileTransport: log file corrupted at offset: %lu",
+              (offset_ + readState_.lastDispatchPtr_));
               
       GlobalOutput(errorMsg);
       throw TTransportException(errorMsg);