Regenerated project files

10 files changed, 54 insertions, 62 deletions

diff --git a/JSImpl/test/Test.make b/JSImpl/test/Test.make
index da8af69..4836496 100644
--- a/JSImpl/test/Test.make
+++ b/JSImpl/test/Test.make
@@ -46,7 +46,7 @@ ifeq ($(config),debug64)
   OBJDIR              = ../build/obj/Debug/x64/Debug/Test
   TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/Test
-  DEFINES            +=
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   INCLUDES           += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".."
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
@@ -78,7 +78,7 @@ ifeq ($(config),release64)
   OBJDIR              = ../build/obj/Release/x64/Release/Test
   TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/Test
-  DEFINES            +=
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   INCLUDES           += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".."
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
diff --git a/JSImpl/test/Test.vcxproj b/JSImpl/test/Test.vcxproj
index 9c67eae..6bf7d68 100644
--- a/JSImpl/test/Test.vcxproj
+++ b/JSImpl/test/Test.vcxproj
@@ -21,13 +21,11 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

   <ImportGroup Label="ExtensionSettings">

@@ -58,7 +56,7 @@
       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions></PreprocessorDefinitions>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -71,7 +69,7 @@
       <ProgramDataBaseFileName>$(IntDir)Test.compile.pdb</ProgramDataBaseFileName>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions></PreprocessorDefinitions>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

@@ -88,7 +86,7 @@
       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>MaxSpeed</Optimization>

       <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions></PreprocessorDefinitions>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

@@ -101,7 +99,7 @@
       <ProgramDataBaseFileName>$(IntDir)Test.compile.pdb</ProgramDataBaseFileName>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions></PreprocessorDefinitions>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

diff --git a/JSImpl/test/gmock.make b/JSImpl/test/gmock.make
index 77b912c..590c3e4 100644
--- a/JSImpl/test/gmock.make
+++ b/JSImpl/test/gmock.make
@@ -46,7 +46,7 @@ ifeq ($(config),debug64)
   OBJDIR              = ../build/obj/Debug/x64/Debug/gmock
   TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/libgmock.a
-  DEFINES            +=
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   INCLUDES           += -I"googletest/googlemock" -I"googletest/googlemock/include" -I"googletest/googletest/include"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
@@ -76,7 +76,7 @@ ifeq ($(config),release64)
   OBJDIR              = ../build/obj/Release/x64/Release/gmock
   TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/libgmock.a
-  DEFINES            +=
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   INCLUDES           += -I"googletest/googlemock" -I"googletest/googlemock/include" -I"googletest/googletest/include"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
diff --git a/JSImpl/test/gmock.vcxproj b/JSImpl/test/gmock.vcxproj
index d2dd518..8fbaa69 100644
--- a/JSImpl/test/gmock.vcxproj
+++ b/JSImpl/test/gmock.vcxproj
@@ -21,13 +21,11 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

   <ImportGroup Label="ExtensionSettings">

@@ -56,7 +54,7 @@
       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions></PreprocessorDefinitions>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -69,7 +67,7 @@
       <ProgramDataBaseFileName>$(OutDir)gmock.pdb</ProgramDataBaseFileName>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions></PreprocessorDefinitions>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

   <Lib>

@@ -87,7 +85,7 @@
       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>MaxSpeed</Optimization>

       <AdditionalIncludeDirectories>googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions></PreprocessorDefinitions>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

@@ -100,7 +98,7 @@
       <ProgramDataBaseFileName>$(OutDir)gmock.pdb</ProgramDataBaseFileName>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions></PreprocessorDefinitions>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

   <Lib>

@@ -116,17 +114,17 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-spec-builders.h" />

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock.h" />

     <ClInclude Include="googletest\googlemock\include\gmock\gmock-actions.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-cardinalities.h" />

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-matchers.h" />

     <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-actions.h" />

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-matchers.h" />

     <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-function-mockers.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-matchers.h" />

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-cardinalities.h" />

     <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-nice-strict.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-matchers.h" />

     <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-actions.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-matchers.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-spec-builders.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock.h" />

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-matchers.h" />

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="googletest\googlemock\src\gmock-all.cc">

diff --git a/JSImpl/test/gmock.vcxproj.filters b/JSImpl/test/gmock.vcxproj.filters
index 7ecdd12..01914f2 100644
--- a/JSImpl/test/gmock.vcxproj.filters
+++ b/JSImpl/test/gmock.vcxproj.filters
@@ -18,37 +18,37 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-actions.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-spec-builders.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-cardinalities.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-actions.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-actions.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-function-mockers.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-matchers.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-matchers.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-actions.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-nice-strict.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-matchers.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-matchers.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-function-mockers.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-actions.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-cardinalities.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-matchers.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-nice-strict.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-spec-builders.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-actions.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-matchers.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

   </ItemGroup>

diff --git a/JSImpl/test/gtest.make b/JSImpl/test/gtest.make
index 942964a..50c7757 100644
--- a/JSImpl/test/gtest.make
+++ b/JSImpl/test/gtest.make
@@ -46,7 +46,7 @@ ifeq ($(config),debug64)
   OBJDIR              = ../build/obj/Debug/x64/Debug/gtest
   TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/libgtest.a
-  DEFINES            +=
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   INCLUDES           += -I"googletest/googletest" -I"googletest/googletest/include"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
@@ -76,7 +76,7 @@ ifeq ($(config),release64)
   OBJDIR              = ../build/obj/Release/x64/Release/gtest
   TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/libgtest.a
-  DEFINES            +=
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   INCLUDES           += -I"googletest/googletest" -I"googletest/googletest/include"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
diff --git a/JSImpl/test/gtest.vcxproj b/JSImpl/test/gtest.vcxproj
index 85be299..623e8f5 100644
--- a/JSImpl/test/gtest.vcxproj
+++ b/JSImpl/test/gtest.vcxproj
@@ -21,13 +21,11 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

   <ImportGroup Label="ExtensionSettings">

@@ -56,7 +54,7 @@
       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions></PreprocessorDefinitions>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -69,7 +67,7 @@
       <ProgramDataBaseFileName>$(OutDir)gtest.pdb</ProgramDataBaseFileName>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions></PreprocessorDefinitions>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

   <Lib>

@@ -87,7 +85,7 @@
       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>MaxSpeed</Optimization>

       <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions></PreprocessorDefinitions>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

@@ -100,7 +98,7 @@
       <ProgramDataBaseFileName>$(OutDir)gtest.pdb</ProgramDataBaseFileName>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions></PreprocessorDefinitions>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

   <Lib>

@@ -116,16 +114,16 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-death-test.h" />

+    <ClInclude Include="googletest\googletest\include\gtest\gtest_prod.h" />

     <ClInclude Include="googletest\googletest\include\gtest\gtest-message.h" />

     <ClInclude Include="googletest\googletest\include\gtest\gtest-param-test.h" />

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-printers.h" />

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-spi.h" />

     <ClInclude Include="googletest\googletest\include\gtest\gtest-test-part.h" />

+    <ClInclude Include="googletest\googletest\include\gtest\gtest-printers.h" />

     <ClInclude Include="googletest\googletest\include\gtest\gtest-typed-test.h" />

-    <ClInclude Include="googletest\googletest\include\gtest\gtest.h" />

+    <ClInclude Include="googletest\googletest\include\gtest\gtest-spi.h" />

     <ClInclude Include="googletest\googletest\include\gtest\gtest_pred_impl.h" />

-    <ClInclude Include="googletest\googletest\include\gtest\gtest_prod.h" />

+    <ClInclude Include="googletest\googletest\include\gtest\gtest.h" />

+    <ClInclude Include="googletest\googletest\include\gtest\gtest-death-test.h" />

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="googletest\googletest\src\gtest-all.cc">

diff --git a/JSImpl/test/gtest.vcxproj.filters b/JSImpl/test/gtest.vcxproj.filters
index 3a35c75..780060b 100644
--- a/JSImpl/test/gtest.vcxproj.filters
+++ b/JSImpl/test/gtest.vcxproj.filters
@@ -18,7 +18,7 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-death-test.h">

+    <ClInclude Include="googletest\googletest\include\gtest\gtest_prod.h">

       <Filter>googletest\googletest\include\gtest</Filter>

     </ClInclude>

     <ClInclude Include="googletest\googletest\include\gtest\gtest-message.h">

@@ -27,25 +27,25 @@
     <ClInclude Include="googletest\googletest\include\gtest\gtest-param-test.h">

       <Filter>googletest\googletest\include\gtest</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-printers.h">

-      <Filter>googletest\googletest\include\gtest</Filter>

-    </ClInclude>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-spi.h">

+    <ClInclude Include="googletest\googletest\include\gtest\gtest-test-part.h">

       <Filter>googletest\googletest\include\gtest</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-test-part.h">

+    <ClInclude Include="googletest\googletest\include\gtest\gtest-printers.h">

       <Filter>googletest\googletest\include\gtest</Filter>

     </ClInclude>

     <ClInclude Include="googletest\googletest\include\gtest\gtest-typed-test.h">

       <Filter>googletest\googletest\include\gtest</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest.h">

+    <ClInclude Include="googletest\googletest\include\gtest\gtest-spi.h">

       <Filter>googletest\googletest\include\gtest</Filter>

     </ClInclude>

     <ClInclude Include="googletest\googletest\include\gtest\gtest_pred_impl.h">

       <Filter>googletest\googletest\include\gtest</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest_prod.h">

+    <ClInclude Include="googletest\googletest\include\gtest\gtest.h">

+      <Filter>googletest\googletest\include\gtest</Filter>

+    </ClInclude>

+    <ClInclude Include="googletest\googletest\include\gtest\gtest-death-test.h">

       <Filter>googletest\googletest\include\gtest</Filter>

     </ClInclude>

   </ItemGroup>

diff --git a/JSImpl/test/gtest_main.make b/JSImpl/test/gtest_main.make
index 7b5cac2..4aa9a75 100644
--- a/JSImpl/test/gtest_main.make
+++ b/JSImpl/test/gtest_main.make
@@ -46,7 +46,7 @@ ifeq ($(config),debug64)
   OBJDIR              = ../build/obj/Debug/x64/Debug/gtest_main
   TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/libgtest_main.a
-  DEFINES            +=
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   INCLUDES           += -I"googletest/googletest" -I"googletest/googletest/include"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
@@ -76,7 +76,7 @@ ifeq ($(config),release64)
   OBJDIR              = ../build/obj/Release/x64/Release/gtest_main
   TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/libgtest_main.a
-  DEFINES            +=
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   INCLUDES           += -I"googletest/googletest" -I"googletest/googletest/include"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
diff --git a/JSImpl/test/gtest_main.vcxproj b/JSImpl/test/gtest_main.vcxproj
index 0d93122..997d941 100644
--- a/JSImpl/test/gtest_main.vcxproj
+++ b/JSImpl/test/gtest_main.vcxproj
@@ -21,13 +21,11 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

   <ImportGroup Label="ExtensionSettings">

@@ -56,7 +54,7 @@
       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions></PreprocessorDefinitions>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -69,7 +67,7 @@
       <ProgramDataBaseFileName>$(OutDir)gtest_main.pdb</ProgramDataBaseFileName>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions></PreprocessorDefinitions>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

   <Lib>

@@ -87,7 +85,7 @@
       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>MaxSpeed</Optimization>

       <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions></PreprocessorDefinitions>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

@@ -100,7 +98,7 @@
       <ProgramDataBaseFileName>$(OutDir)gtest_main.pdb</ProgramDataBaseFileName>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions></PreprocessorDefinitions>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

   <Lib>