resolved conflicts for merge of 54cb63e2 to master

[android/aapt.git] / ZipEntry.h

diff --git a/ZipEntry.h b/ZipEntry.h
index 7f721b46321a16a112c8ff707fd349841d9c8a21..c2f3227cf230bc92ec998adc905920b0ecf7e449 100644 (file)
--- a/ZipEntry.h
+++ b/ZipEntry.h
@@ -71,6 +71,11 @@ public:
      */
     off_t getCompressedLen(void) const { return mCDE.mCompressedSize; }
 
      */
     off_t getCompressedLen(void) const { return mCDE.mCompressedSize; }
 

+    /*
+     * Return the offset of the local file header.
+     */
+    off_t getLFHOffset(void) const { return mCDE.mLocalHeaderRelOffset; }
+

     /*
      * Return the absolute file offset of the start of the compressed or
      * uncompressed data.
     /*
      * Return the absolute file offset of the start of the compressed or
      * uncompressed data.


@@ -185,11 +190,6 @@ protected:
      */
     void setModWhen(time_t when);
 
      */
     void setModWhen(time_t when);
 

-    /*
-     * Return the offset of the local file header.
-     */
-    off_t getLFHOffset(void) const { return mCDE.mLocalHeaderRelOffset; }
-

     /*
      * Set the offset of the local file header, relative to the start of
      * the current file.
     /*
      * Set the offset of the local file header, relative to the start of
      * the current file.