From 5707b1e5e5ec9f113332f229b34df72788d3e03a Mon Sep 17 00:00:00 2001
From: Rafael Roquetto <rafael.roquetto@kdab.com>
Date: Fri, 15 Apr 2016 13:20:44 -0300
Subject: Fix MSVC2015 build.

Change-Id: I502e48dea6329bd6f05a776a669093f41698a274
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
---
 src/libs/7zip/win/CPP/7zip/Archive/7z/7zUpdate.cpp | 2 +-
 src/libs/7zip/win/CPP/7zip/UI/Common/Update.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libs/7zip')

diff --git a/src/libs/7zip/win/CPP/7zip/Archive/7z/7zUpdate.cpp b/src/libs/7zip/win/CPP/7zip/Archive/7z/7zUpdate.cpp
index ee7f55c04..874e94e68 100644
--- a/src/libs/7zip/win/CPP/7zip/Archive/7z/7zUpdate.cpp
+++ b/src/libs/7zip/win/CPP/7zip/Archive/7z/7zUpdate.cpp
@@ -322,7 +322,7 @@ struct CSolidGroup
   CRecordVector<UInt32> Indices;
 };
 
-static wchar_t *g_ExeExts[] =
+static const wchar_t *g_ExeExts[] =
 {
   L"dll",
   L"exe",
diff --git a/src/libs/7zip/win/CPP/7zip/UI/Common/Update.cpp b/src/libs/7zip/win/CPP/7zip/UI/Common/Update.cpp
index a57ec2a6b..4b9c6abac 100644
--- a/src/libs/7zip/win/CPP/7zip/UI/Common/Update.cpp
+++ b/src/libs/7zip/win/CPP/7zip/UI/Common/Update.cpp
@@ -902,7 +902,7 @@ HRESULT UpdateArchive(
       AString path = GetAnsiString(arcPath);
       AString name = GetAnsiString(fileName);
       // Warning!!! MAPISendDocuments function changes Current directory
-      fnSend(0, ";", (LPSTR)(LPCSTR)path, (LPSTR)(LPCSTR)name, 0);
+      fnSend(0, const_cast<LPSTR>(";"), (LPSTR)(LPCSTR)path, (LPSTR)(LPCSTR)name, 0);
     }
   }
   #endif
-- 
cgit v1.2.3