Avoid max macro collision (#474)

kennykerr · web-flow · commit 284187739060 · 2020-01-16T12:37:02.000-08:00
diff --git a/cppwinrt.props b/cppwinrt.props
@@ -53,7 +53,7 @@
       <LanguageStandard>stdcpp17</LanguageStandard>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>CPPWINRT_VERSION_STRING="$(CppWinRTBuildVersion)";NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CPPWINRT_VERSION_STRING="$(CppWinRTBuildVersion)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalOptions>/await /bigobj</AdditionalOptions>
       <AdditionalOptions Condition="'$(Clang)'=='1'">-Wno-unused-command-line-argument -fno-delayed-template-parsing -Xclang -fcoroutines-ts -mcx16</AdditionalOptions>
diff --git a/cppwinrt/cmd_reader.h b/cppwinrt/cmd_reader.h
@@ -287,7 +287,7 @@ namespace cppwinrt
     struct option
     {
         static constexpr uint32_t no_min = 0;
-        static constexpr uint32_t no_max = std::numeric_limits<uint32_t>::max();
+        static constexpr uint32_t no_max = UINT_MAX;
         
         std::string_view name;
         uint32_t min{ no_min };
diff --git a/cppwinrt/helpers.h b/cppwinrt/helpers.h
@@ -541,7 +541,7 @@ namespace cppwinrt
 
         for (auto&& type : classes)
         {
-            result = std::max(result, get_fastabi_size(w, type));
+            result = (std::max)(result, get_fastabi_size(w, type));
         }
 
         return result;
diff --git a/scratch/scratch.vcxproj b/scratch/scratch.vcxproj
@@ -150,7 +150,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(OutputPath);Generated Files;..\..\..\library</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(OutputPath);Generated Files;..\..\..\library</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
@@ -190,7 +190,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(OutputPath);Generated Files;..\..\..\library</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
@@ -210,7 +210,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(OutputPath);Generated Files;..\..\..\library</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
diff --git a/strings/base_string.h b/strings/base_string.h
@@ -77,7 +77,7 @@ namespace winrt::impl
         WINRT_ASSERT(length != 0);
         uint64_t bytes_required = sizeof(shared_hstring_header) + sizeof(wchar_t) * length;
 
-        if (bytes_required > std::numeric_limits<uint32_t>::max())
+        if (bytes_required > UINT_MAX)
         {
             throw std::invalid_argument("length");
         }
diff --git a/strings/base_string_input.h b/strings/base_string_input.h
@@ -37,7 +37,7 @@ WINRT_EXPORT namespace winrt::param
     private:
         void create_string_reference(wchar_t const* const data, size_t size) noexcept
         {
-            WINRT_ASSERT(size < std::numeric_limits<uint32_t>::max());
+            WINRT_ASSERT(size < UINT_MAX);
             auto size32 = static_cast<uint32_t>(size);
 
             if (size32 == 0)
diff --git a/test/test/test.vcxproj b/test/test/test.vcxproj
@@ -128,7 +128,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(OutputPath);Generated Files;..;..\..\cppwinrt</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -148,7 +148,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(OutputPath);Generated Files;..;..\..\cppwinrt</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -166,7 +166,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(OutputPath);Generated Files;..;..\..\cppwinrt</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -184,7 +184,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(OutputPath);Generated Files;..;..\..\cppwinrt</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -202,7 +202,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(OutputPath);Generated Files;..;..\..\cppwinrt</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -222,7 +222,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(OutputPath);Generated Files;..;..\..\cppwinrt</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -244,7 +244,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(OutputPath);Generated Files;..;..\..\cppwinrt</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -266,7 +266,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(OutputPath);Generated Files;..;..\..\cppwinrt</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ namespace cppwinrt`
`287`	`287`	`struct option`
`288`	`288`	`{`
`289`	`289`	`static constexpr uint32_t no_min = 0;`
`290`		`- static constexpr uint32_t no_max = std::numeric_limits<uint32_t>::max();`
	`290`	`+ static constexpr uint32_t no_max = UINT_MAX;`
`291`	`291`
`292`	`292`	`std::string_view name;`
`293`	`293`	`uint32_t min{ no_min };`
Original file line number	Diff line number	Diff line change
`@@ -541,7 +541,7 @@ namespace cppwinrt`
`541`	`541`
`542`	`542`	`for (auto&& type : classes)`
`543`	`543`	`{`
`544`		`- result = std::max(result, get_fastabi_size(w, type));`
	`544`	`+ result = (std::max)(result, get_fastabi_size(w, type));`
`545`	`545`	`}`
`546`	`546`
`547`	`547`	`return result;`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ namespace winrt::impl`
`77`	`77`	`WINRT_ASSERT(length != 0);`
`78`	`78`	`uint64_t bytes_required = sizeof(shared_hstring_header) + sizeof(wchar_t) * length;`
`79`	`79`
`80`		`- if (bytes_required > std::numeric_limits<uint32_t>::max())`
	`80`	`+ if (bytes_required > UINT_MAX)`
`81`	`81`	`{`
`82`	`82`	`throw std::invalid_argument("length");`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ WINRT_EXPORT namespace winrt::param`
`37`	`37`	`private:`
`38`	`38`	`void create_string_reference(wchar_t const* const data, size_t size) noexcept`
`39`	`39`	`{`
`40`		`- WINRT_ASSERT(size < std::numeric_limits<uint32_t>::max());`
	`40`	`+ WINRT_ASSERT(size < UINT_MAX);`
`41`	`41`	`auto size32 = static_cast<uint32_t>(size);`
`42`	`42`
`43`	`43`	`if (size32 == 0)`