svn commit: r1154022 - /thrift/trunk/lib/cpp/src/transport/TFileTransport.cpp

[ro...@apache.org]

Author: roger
Date: Thu Aug  4 21:23:27 2011
New Revision: 1154022

URL: http://svn.apache.org/viewvc?rev=1154022&view=rev
Log:
THRIFT-916 remove i64 => fix build and compile without warning on CI

Modified:
    thrift/trunk/lib/cpp/src/transport/TFileTransport.cpp

Modified: thrift/trunk/lib/cpp/src/transport/TFileTransport.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/src/transport/TFileTransport.cpp?rev=1154022&r1=1154021&r2=1154022&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/src/transport/TFileTransport.cpp (original)
+++ thrift/trunk/lib/cpp/src/transport/TFileTransport.cpp Thu Aug  4 21:23:27 2011
@@ -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);