From de95efbdffdc0e247e347e57dd1a1293394e06de Mon Sep 17 00:00:00 2001
From: henrik karlsson <henrik.karlsson@epicgames.com>
Date: Thu, 10 Nov 2022 01:08:40 -0500
Subject: [PATCH] [UnrealBuildTool] * Enabled _cplusplus preprocessor define
 representing correct number

Thanks michel.champoux for the fixes in date.h that solves older msvc compiler compile errors

#preflight 636bfebc7c2b5051901ce8c2
#rb joe.kirchoff

[CL 23071825 by henrik karlsson in ue5-main branch]
---
 .../NNI/Source/ThirdParty/Deps/date/include/date/date.h       | 4 ++--
 .../UnrealBuildTool/Platform/Windows/UEBuildWindows.cs        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Engine/Plugins/Experimental/NNI/Source/ThirdParty/Deps/date/include/date/date.h b/Engine/Plugins/Experimental/NNI/Source/ThirdParty/Deps/date/include/date/date.h
index cb115a9c0949..7025543537e9 100644
--- a/Engine/Plugins/Experimental/NNI/Source/ThirdParty/Deps/date/include/date/date.h
+++ b/Engine/Plugins/Experimental/NNI/Source/ThirdParty/Deps/date/include/date/date.h
@@ -7575,7 +7575,7 @@ CONSTCD14
 inline
 std::enable_if_t
 <
-    std::is_same<CharT, char>{},
+    (std::is_same<CharT, char>{}),
     string_literal<char, 3>
 >
 msl(std::micro) NOEXCEPT
@@ -7588,7 +7588,7 @@ CONSTCD14
 inline
 std::enable_if_t
 <
-    !std::is_same<CharT, char>{},
+    !(std::is_same<CharT, char>{}),
     string_literal<CharT, 2>
 >
 msl(std::micro) NOEXCEPT
diff --git a/Engine/Source/Programs/UnrealBuildTool/Platform/Windows/UEBuildWindows.cs b/Engine/Source/Programs/UnrealBuildTool/Platform/Windows/UEBuildWindows.cs
index d5a6fb0df55a..ceead90c4c92 100644
--- a/Engine/Source/Programs/UnrealBuildTool/Platform/Windows/UEBuildWindows.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/Platform/Windows/UEBuildWindows.cs
@@ -306,7 +306,7 @@ namespace UnrealBuildTool
 		[RequiresUniqueBuildEnvironment]
 		[XmlConfigFile(Category = "WindowsPlatform")]
 		[CommandLine("-UpdatedCPPMacro")]
-		public bool bUpdatedCPPMacro = false;
+		public bool bUpdatedCPPMacro = true;
 
 		/// <summary>
 		/// Enables inline conformance (Remove unreferenced COMDAT) (/Zc:inline).