From 7f08dbbf78a77db013b87733353d77a19c307f83 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 9 Sep 2015 03:39:17 +0200
Subject: [PATCH] Another work around for VC8 compiler bug after ZIP64 changes

Apply the same fix as in ba851346b59e5c079a9fc34f3963231c4aa6ee87 in another
place where the same bug occurs.
---
 src/common/zipstrm.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index c99da77d51..54824b3572 100644
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -1152,8 +1152,10 @@ size_t wxZipEntry::ReadCentral(wxInputStream& stream, wxMBConv& conv)
        >> m_DiskStart >> m_InternalAttributes >> m_ExternalAttributes;
     SetOffset(ds.Read32());
 
-    wxMBConv& strConv =
-        ((m_Flags & wxZIP_LANG_ENC_UTF8) == 0) ? conv : wxConvUTF8;
+    // Another MSVS 2005 workaround, see above (FIXME-VC8).
+    wxMBConv& strConv = m_Flags & wxZIP_LANG_ENC_UTF8
+                            ? static_cast<wxMBConv&>(wxConvUTF8)
+                            : conv;
     SetName(ReadString(stream, nameLen, strConv), wxPATH_UNIX);
     if (stream.LastRead() != nameLen + 0u)
         return 0;