From 5afcf2c123cfb9132f64ad344bc475e347f3f484 Mon Sep 17 00:00:00 2001
From: Sup Yut Sum <ch3cooli@gmail.com>
Date: Sat, 2 May 2015 15:41:55 +0200
Subject: [PATCH] Allow to use VS2015RC

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 .gitignore                                           | 1 +
 ext/CrashServer/CrashHandler/SendRpt/SendRpt.vcxproj | 1 -
 ext/CrashServer/external/zlib123/zutil.h             | 2 +-
 src/Git/Git.cpp                                      | 1 +
 src/TortoiseGit.toolset.props                        | 1 +
 src/TortoiseGitSetup/StructureFragment.wxi           | 3 +++
 src/TortoiseProc/GitLogListBase.cpp                  | 6 ++++--
 7 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3a30698cc..af62d2e28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@
 /Languages/.tx
 /sign-x64.bat
 /sign-x86.bat
+/src/.vs
 /src/ipch
 /src/TortoiseShell/register.reg
 /src/TortoiseShell/register_recover.reg
diff --git a/ext/CrashServer/CrashHandler/SendRpt/SendRpt.vcxproj b/ext/CrashServer/CrashHandler/SendRpt/SendRpt.vcxproj
index b075eb343..7e2e99441 100644
--- a/ext/CrashServer/CrashHandler/SendRpt/SendRpt.vcxproj
+++ b/ext/CrashServer/CrashHandler/SendRpt/SendRpt.vcxproj
@@ -40,7 +40,6 @@
     <ClCompile>
       <AdditionalIncludeDirectories>$(GsoapDir);../../external/WTL/Include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NO_DBGHELP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <AdditionalDependencies>version.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/ext/CrashServer/external/zlib123/zutil.h b/ext/CrashServer/external/zlib123/zutil.h
index 0ba6e0208..cda6a1e85 100644
--- a/ext/CrashServer/external/zlib123/zutil.h
+++ b/ext/CrashServer/external/zlib123/zutil.h
@@ -194,7 +194,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  ifdef __TURBOC__
 #    define NO_vsnprintf
 #  endif
-#  ifdef WIN32
+#  if defined(WIN32) && (!defined(_MSC_VER) || _MSC_VER < 1900)
      /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
 #    if !defined(vsnprintf) && !defined(NO_vsnprintf)
 #      define vsnprintf _vsnprintf
diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index a991766b3..f372df428 100644
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -24,6 +24,7 @@
 #include "UnicodeUtils.h"
 #include "gitdll.h"
 #include <fstream>
+#include <iterator>
 #include "FormatMessageWrapper.h"
 #include "SmartHandle.h"
 #include "MassiveGitTaskBase.h"
diff --git a/src/TortoiseGit.toolset.props b/src/TortoiseGit.toolset.props
index 1b1bf05c0..e56e56b15 100644
--- a/src/TortoiseGit.toolset.props
+++ b/src/TortoiseGit.toolset.props
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VisualStudioVersion)' == '14.0'">v140_xp</PlatformToolset>
     <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VisualStudioVersion)' == '12.0'">v120_xp</PlatformToolset>
     <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VisualStudioVersion)' == '11.0'">v110_xp</PlatformToolset>
   </PropertyGroup>
diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi
index 9bc5a6bb9..807a54858 100644
--- a/src/TortoiseGitSetup/StructureFragment.wxi
+++ b/src/TortoiseGitSetup/StructureFragment.wxi
@@ -14,6 +14,9 @@
 	<Fragment Id="StructureFragment">
 -->
 
+<?if $(var.VisualStudioVersion) = "14.0" ?>
+<?define vcver="140" ?>
+<?endif ?>
 <?if $(var.VisualStudioVersion) = "12.0" ?>
 <?define vcver="120" ?>
 <?endif ?>
diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp
index 8ef18598c..ba581dd37 100644
--- a/src/TortoiseProc/GitLogListBase.cpp
+++ b/src/TortoiseProc/GitLogListBase.cpp
@@ -1542,7 +1542,8 @@ CString FindSVNRev(const CString& msg)
 	{
 		const std::tr1::wsregex_iterator end;
 		std::wstring s = msg;
-		for (std::tr1::wsregex_iterator it(s.begin(), s.end(), std::tr1::wregex(_T("^\\s*git-svn-id:\\s+(.*)\\@(\\d+)\\s([a-f\\d\\-]+)$"))); it != end; ++it)
+		std::tr1::wregex regex1(_T("^\\s*git-svn-id:\\s+(.*)\\@(\\d+)\\s([a-f\\d\\-]+)$"));
+		for (std::tr1::wsregex_iterator it(s.begin(), s.end(), regex1); it != end; ++it)
 		{
 			const std::tr1::wsmatch match = *it;
 			if (match.size() == 4)
@@ -1551,7 +1552,8 @@ CString FindSVNRev(const CString& msg)
 				return std::wstring(match[2]).c_str();
 			}
 		}
-		for (std::tr1::wsregex_iterator it(s.begin(), s.end(), std::tr1::wregex(_T("^\\s*git-svn-id:\\s(\\d+)\\@([a-f\\d\\-]+)$"))); it != end; ++it)
+		std::tr1::wregex regex2(_T("^\\s*git-svn-id:\\s(\\d+)\\@([a-f\\d\\-]+)$"));
+		for (std::tr1::wsregex_iterator it(s.begin(), s.end(), regex2); it != end; ++it)
 		{
 			const std::tr1::wsmatch match = *it;
 			if (match.size() == 3)
-- 
2.11.4.GIT