Fix UWP issues with min/max macros.

ras0219-msft · ras0219-msft · commit 3e8dcf5b574f · 2017-12-19T04:14:17.000-08:00
diff --git a/Release/include/cpprest/streams.h b/Release/include/cpprest/streams.h
@@ -1714,6 +1714,7 @@ class type_parser<CharType,char> : public _type_parser_base<CharType>
 template<class CharType>
 class type_parser<CharType, std::enable_if_t<sizeof(CharType) == 1, std::basic_string<wchar_t>>> : public _type_parser_base<CharType>
 {
+    typedef typename concurrency::streams::streambuf<CharType>::int_type int_type;
 public:
     static pplx::task<std::wstring> parse(streams::streambuf<CharType> buffer)
     {
diff --git a/Release/src/http/client/http_client_winrt.cpp b/Release/src/http/client/http_client_winrt.cpp
@@ -28,6 +28,9 @@ using namespace std;
 using namespace Platform;
 using namespace Microsoft::WRL;
 
+#undef min
+#undef max
+
 namespace web
 {
 namespace http

Original file line number	Diff line number	Diff line change
`@@ -1714,6 +1714,7 @@ class type_parser<CharType,char> : public _type_parser_base<CharType>`
`1714`	`1714`	`template<class CharType>`
`1715`	`1715`	`class type_parser<CharType, std::enable_if_t<sizeof(CharType) == 1, std::basic_string<wchar_t>>> : public _type_parser_base<CharType>`
`1716`	`1716`	`{`
	`1717`	`+ typedef typename concurrency::streams::streambuf<CharType>::int_type int_type;`
`1717`	`1718`	`public:`
`1718`	`1719`	`static pplx::task<std::wstring> parse(streams::streambuf<CharType> buffer)`
`1719`	`1720`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,9 @@ using namespace std;`
`28`	`28`	`using namespace Platform;`
`29`	`29`	`using namespace Microsoft::WRL;`
`30`	`30`
	`31`	`+#undef min`
	`32`	`+#undef max`
	`33`	`+`
`31`	`34`	`namespace web`
`32`	`35`	`{`
`33`	`36`	`namespace http`