From 63615e323a6eb988b8d31550255b14e14467c980 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Mon, 24 Aug 2015 08:18:30 -0700 Subject: [PATCH] avoid GCC warning "enumeral and non-enumeral type in conditional expression" --- src/common/zipstrm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp index b5e41a162d..391cb92334 100644 --- a/src/common/zipstrm.cpp +++ b/src/common/zipstrm.cpp @@ -1094,7 +1094,7 @@ size_t wxZipEntry::WriteLocal(wxOutputStream& stream, wxMBConv& conv) const bool z64Required = m_CompressedSize > 0xffffffff || m_Size > 0xffffffff; wxUint16 versionNeeded = - (z64Required) ? Z64_VERSION_NEEDED_TO_EXTRACT : m_VersionNeeded; + z64Required ? Z64_VERSION_NEEDED_TO_EXTRACT : int(m_VersionNeeded); wxDataOutputStream ds(stream);