From 03378bf5015987dd140d7fabd3d043ae909a4afc Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Fri, 30 Sep 2016 10:32:58 +1000
Subject: Enable SplitVector to store objects by using std::copy to copy
 elements instead of memmove and memcpy. This allows SplitVector<std::string>
 to work.

---
 win32/SciLexer.vcxproj | 2 +-
 win32/scintilla.mak    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'win32')

diff --git a/win32/SciLexer.vcxproj b/win32/SciLexer.vcxproj
index 2e821b39a..68a9e8fcd 100644
--- a/win32/SciLexer.vcxproj
+++ b/win32/SciLexer.vcxproj
@@ -56,7 +56,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>WIN32;SCI_LEXER;_CRT_SECURE_NO_DEPRECATE;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;SCI_LEXER;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\include;..\src;..\lexlib;</AdditionalIncludeDirectories>
       <BrowseInformation>true</BrowseInformation>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index 6a3be2564..483f78b3c 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -24,7 +24,7 @@ XP_DEFINE=-D_USING_V110_SDK71_
 XP_LINK=-SUBSYSTEM:WINDOWS,5.01
 !ENDIF
 
-CRTFLAGS=-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 -D_CRT_SECURE_NO_DEPRECATE=1 $(XP_DEFINE)
+CRTFLAGS=-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 -D_CRT_SECURE_NO_DEPRECATE=1 -D_SCL_SECURE_NO_WARNINGS=1 $(XP_DEFINE)
 CXXFLAGS=-Zi -TP -MP -W4 -EHsc -Zc:forScope -Zc:wchar_t $(CRTFLAGS)
 CXXDEBUG=-Od -MTd -DDEBUG
 CXXNDEBUG=-O1 -MT -DNDEBUG -GL
-- 
cgit v1.2.3