From daeff2ce9e121854cbe1af7ef585f78fe8ee9c61 Mon Sep 17 00:00:00 2001
From: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com>
Date: Mon, 4 Nov 2024 11:58:06 -0800
Subject: [PATCH] Minor code cleanups (#6169)

* Minor code cleanups

* Update claims_based_security_impl.hpp

Undo UniqueAmqpCbsHandle removal - it is right, but will create problems for Larry working in a feature branch when merging it back.

* Update claims_based_security_impl.hpp

---------

Co-authored-by: Anton Kolesnyk <antkmsft@users.noreply.github.com>
---
 sdk/core/azure-core/src/base64.cpp          |  9 ---------
 sdk/core/azure-core/src/datetime.cpp        |  1 -
 sdk/core/azure-core/src/http/curl/curl.cpp  | 12 ------------
 sdk/core/azure-core/src/http/http.cpp       |  2 --
 sdk/core/azure-core/src/http/log_policy.cpp |  3 ---
 5 files changed, 27 deletions(-)

diff --git a/sdk/core/azure-core/src/base64.cpp b/sdk/core/azure-core/src/base64.cpp
index e1a3a2e7a..5e4be1c62 100644
--- a/sdk/core/azure-core/src/base64.cpp
+++ b/sdk/core/azure-core/src/base64.cpp
@@ -3,8 +3,6 @@
 
 #include "azure/core/base64.hpp"
 
-#include "azure/core/platform.hpp"
-
 #include <string>
 #include <vector>
 
@@ -336,15 +334,11 @@ std::string Base64Encode(uint8_t const* const data, size_t length)
   {
     int32_t result = Base64EncodeAndPadTwo(&data[sourceIndex]);
     Base64WriteIntAsFourBytes(destination, result);
-    destination += 4;
-    sourceIndex += 1;
   }
   else if (sourceIndex + 2 == inputSize)
   {
     int32_t result = Base64EncodeAndPadOne(&data[sourceIndex]);
     Base64WriteIntAsFourBytes(destination, result);
-    destination += 4;
-    sourceIndex += 2;
   }
 
   return encodedResult;
@@ -453,7 +447,6 @@ std::vector<uint8_t> Base64Decode(const std::string& text)
     }
 
     Base64WriteThreeLowOrderBytes(destinationPtr, i0);
-    destinationPtr += 3;
   }
   else if (i2 != EncodingPad)
   {
@@ -469,7 +462,6 @@ std::vector<uint8_t> Base64Decode(const std::string& text)
 
     destinationPtr[1] = static_cast<uint8_t>(i0 >> 8);
     destinationPtr[0] = static_cast<uint8_t>(i0 >> 16);
-    destinationPtr += 2;
   }
   else
   {
@@ -479,7 +471,6 @@ std::vector<uint8_t> Base64Decode(const std::string& text)
     }
 
     destinationPtr[0] = static_cast<uint8_t>(i0 >> 16);
-    destinationPtr += 1;
   }
 
   return destination;
diff --git a/sdk/core/azure-core/src/datetime.cpp b/sdk/core/azure-core/src/datetime.cpp
index 0869ae57c..be54dbacd 100644
--- a/sdk/core/azure-core/src/datetime.cpp
+++ b/sdk/core/azure-core/src/datetime.cpp
@@ -4,7 +4,6 @@
 #include "azure/core/datetime.hpp"
 
 #include "azure/core/internal/strings.hpp"
-#include "azure/core/platform.hpp"
 
 #include <algorithm>
 #include <ctime>
diff --git a/sdk/core/azure-core/src/http/curl/curl.cpp b/sdk/core/azure-core/src/http/curl/curl.cpp
index c11123174..40c9efadf 100644
--- a/sdk/core/azure-core/src/http/curl/curl.cpp
+++ b/sdk/core/azure-core/src/http/curl/curl.cpp
@@ -14,21 +14,9 @@
 #endif
 #endif
 
-#include "azure/core/platform.hpp"
-
-#if defined(AZ_PLATFORM_WINDOWS)
-#if !defined(WIN32_LEAN_AND_MEAN)
-#define WIN32_LEAN_AND_MEAN
-#endif
-#if !defined(NOMINMAX)
-#define NOMINMAX
-#endif
-#endif
-
 #include "azure/core/http/curl_transport.hpp"
 #include "azure/core/http/http.hpp"
 #include "azure/core/http/policies/policy.hpp"
-#include "azure/core/http/transport.hpp"
 #include "azure/core/internal/diagnostics/log.hpp"
 #include "azure/core/internal/strings.hpp"
 
diff --git a/sdk/core/azure-core/src/http/http.cpp b/sdk/core/azure-core/src/http/http.cpp
index 6f2862bdb..5d5fa3a17 100644
--- a/sdk/core/azure-core/src/http/http.cpp
+++ b/sdk/core/azure-core/src/http/http.cpp
@@ -3,13 +3,11 @@
 
 #include "azure/core/http/http.hpp"
 
-#include "azure/core/http/policies/policy.hpp"
 #include "azure/core/internal/strings.hpp"
 #include "azure/core/url.hpp"
 
 #include <algorithm>
 #include <unordered_set>
-#include <utility>
 
 using namespace Azure::Core;
 using namespace Azure::Core::Http;
diff --git a/sdk/core/azure-core/src/http/log_policy.cpp b/sdk/core/azure-core/src/http/log_policy.cpp
index 7a5f98992..16063ef07 100644
--- a/sdk/core/azure-core/src/http/log_policy.cpp
+++ b/sdk/core/azure-core/src/http/log_policy.cpp
@@ -4,11 +4,8 @@
 #include "azure/core/http/policies/policy.hpp"
 #include "azure/core/internal/diagnostics/log.hpp"
 
-#include <algorithm>
 #include <chrono>
-#include <iterator>
 #include <sstream>
-#include <type_traits>
 
 using Azure::Core::Context;
 using namespace Azure::Core;