From 7d6d3dbf8fb14b02bf9c8da70f1329a6a880818e Mon Sep 17 00:00:00 2001
From: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com>
Date: Thu, 3 Dec 2020 19:16:18 -0800
Subject: [PATCH] Make SDK buildable in VS 2017 (#1078)

---
 sdk/core/azure-core/src/http/body_stream.cpp      | 3 ++-
 sdk/core/azure-core/src/http/curl/curl.cpp        | 3 ++-
 sdk/core/azure-core/src/http/logging_policy.cpp   | 2 +-
 sdk/core/azure-core/src/http/policy.cpp           | 1 +
 sdk/core/azure-core/src/http/retry_policy.cpp     | 2 +-
 sdk/core/azure-core/src/http/telemetry_policy.cpp | 2 ++
 sdk/core/azure-core/src/http/transport_policy.cpp | 1 +
 7 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sdk/core/azure-core/src/http/body_stream.cpp b/sdk/core/azure-core/src/http/body_stream.cpp
index 220f8e21a..c7994dc1c 100644
--- a/sdk/core/azure-core/src/http/body_stream.cpp
+++ b/sdk/core/azure-core/src/http/body_stream.cpp
@@ -23,6 +23,7 @@
 #include <stdexcept>
 #include <vector>
 
+using Azure::Core::Context;
 using namespace Azure::Core::Http;
 
 // Keep reading until buffer is all fill out of the end of stream content is reached
@@ -53,7 +54,7 @@ std::vector<uint8_t> BodyStream::ReadToEnd(Context const& context, BodyStream& b
 
   for (auto chunkNumber = 0;; chunkNumber++)
   {
-    buffer.resize((chunkNumber + 1) * chunkSize);
+    buffer.resize((static_cast<decltype(buffer)::size_type>(chunkNumber) + 1) * chunkSize);
     int64_t readBytes
         = ReadToCount(context, body, buffer.data() + (chunkNumber * chunkSize), chunkSize);
 
diff --git a/sdk/core/azure-core/src/http/curl/curl.cpp b/sdk/core/azure-core/src/http/curl/curl.cpp
index 726b5b776..51027a679 100644
--- a/sdk/core/azure-core/src/http/curl/curl.cpp
+++ b/sdk/core/azure-core/src/http/curl/curl.cpp
@@ -140,6 +140,7 @@ void WinSocketSetBuffSize(curl_socket_t socket)
 #endif // WINDOWS
 } // namespace
 
+using Azure::Core::Context;
 using Azure::Core::Http::CurlConnection;
 using Azure::Core::Http::CurlConnectionPool;
 using Azure::Core::Http::CurlNetworkConnection;
@@ -1149,7 +1150,7 @@ std::unique_ptr<CurlNetworkConnection> CurlConnectionPool::GetCurlConnection(
 // connection to be picked next time some one ask for a connection to the pool (LIFO)
 void CurlConnectionPool::MoveConnectionBackToPool(
     std::unique_ptr<CurlNetworkConnection> connection,
-    Http::HttpStatusCode lastStatusCode)
+    HttpStatusCode lastStatusCode)
 {
   auto code = static_cast<std::underlying_type<Http::HttpStatusCode>::type>(lastStatusCode);
   // laststatusCode = 0
diff --git a/sdk/core/azure-core/src/http/logging_policy.cpp b/sdk/core/azure-core/src/http/logging_policy.cpp
index d5181611d..29fd7b85f 100644
--- a/sdk/core/azure-core/src/http/logging_policy.cpp
+++ b/sdk/core/azure-core/src/http/logging_policy.cpp
@@ -7,7 +7,7 @@
 #include <chrono>
 #include <sstream>
 
-using namespace Azure::Core;
+using Azure::Core::Context;
 using namespace Azure::Core::Http;
 
 namespace {
diff --git a/sdk/core/azure-core/src/http/policy.cpp b/sdk/core/azure-core/src/http/policy.cpp
index 75a049fc6..c9d0f6366 100644
--- a/sdk/core/azure-core/src/http/policy.cpp
+++ b/sdk/core/azure-core/src/http/policy.cpp
@@ -4,6 +4,7 @@
 #include "azure/core/http/policy.hpp"
 #include "azure/core/http/http.hpp"
 
+using Azure::Core::Context;
 using namespace Azure::Core::Http;
 
 #ifndef _MSC_VER
diff --git a/sdk/core/azure-core/src/http/retry_policy.cpp b/sdk/core/azure-core/src/http/retry_policy.cpp
index 84c1e8b3d..d20e4ea2b 100644
--- a/sdk/core/azure-core/src/http/retry_policy.cpp
+++ b/sdk/core/azure-core/src/http/retry_policy.cpp
@@ -10,7 +10,7 @@
 #include <sstream>
 #include <thread>
 
-using namespace Azure::Core;
+using Azure::Core::Context;
 using namespace Azure::Core::Http;
 
 namespace {
diff --git a/sdk/core/azure-core/src/http/telemetry_policy.cpp b/sdk/core/azure-core/src/http/telemetry_policy.cpp
index a7ff4438f..3e1f4d2ec 100644
--- a/sdk/core/azure-core/src/http/telemetry_policy.cpp
+++ b/sdk/core/azure-core/src/http/telemetry_policy.cpp
@@ -3,6 +3,7 @@
 
 #include "azure/core/http/policy.hpp"
 
+#include <cctype>
 #include <sstream>
 
 #ifdef _WIN32
@@ -109,6 +110,7 @@ std::string TrimString(std::string s)
 }
 } // namespace
 
+using Azure::Core::Context;
 using namespace Azure::Core::Http;
 
 std::string TelemetryPolicy::BuildTelemetryId(
diff --git a/sdk/core/azure-core/src/http/transport_policy.cpp b/sdk/core/azure-core/src/http/transport_policy.cpp
index 14375c1d3..e626b8cfc 100644
--- a/sdk/core/azure-core/src/http/transport_policy.cpp
+++ b/sdk/core/azure-core/src/http/transport_policy.cpp
@@ -3,6 +3,7 @@
 
 #include "azure/core/http/policy.hpp"
 
+using Azure::Core::Context;
 using namespace Azure::Core::Http;
 
 std::unique_ptr<RawResponse> TransportPolicy::Send(