From ab7985a34b8a4de59dc9a6e6c4c40fbb564797b8 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 16 Mar 2018 16:53:48 -0700
Subject: [vcpkg-hash] Use BCrypt on Windows

---
 toolsrc/include/vcpkg/base/strings.h |  4 +++-
 toolsrc/include/vcpkg/base/util.h    | 12 ++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'toolsrc/include')

diff --git a/toolsrc/include/vcpkg/base/strings.h b/toolsrc/include/vcpkg/base/strings.h
index 6294853af..c32e81ac2 100644
--- a/toolsrc/include/vcpkg/base/strings.h
+++ b/toolsrc/include/vcpkg/base/strings.h
@@ -46,7 +46,9 @@ namespace vcpkg::Strings
 
     bool case_insensitive_ascii_equals(const CStringView left, const CStringView right);
 
-    std::string ascii_to_lowercase(std::string input);
+    std::string ascii_to_lowercase(std::string s);
+
+    std::string ascii_to_uppercase(std::string s);
 
     bool case_insensitive_ascii_starts_with(const std::string& s, const std::string& pattern);
 
diff --git a/toolsrc/include/vcpkg/base/util.h b/toolsrc/include/vcpkg/base/util.h
index b12919951..c73345719 100644
--- a/toolsrc/include/vcpkg/base/util.h
+++ b/toolsrc/include/vcpkg/base/util.h
@@ -6,8 +6,6 @@
 #include <utility>
 #include <vector>
 
-#include <vcpkg/base/optional.h>
-
 namespace vcpkg::Util
 {
     template<class Container>
@@ -158,6 +156,8 @@ namespace vcpkg::Util
 
         MoveOnlyBase& operator=(const MoveOnlyBase&) = delete;
         MoveOnlyBase& operator=(MoveOnlyBase&&) = default;
+
+        ~MoveOnlyBase() = default;
     };
 
     struct ResourceBase
@@ -168,6 +168,8 @@ namespace vcpkg::Util
 
         ResourceBase& operator=(const ResourceBase&) = delete;
         ResourceBase& operator=(ResourceBase&&) = delete;
+
+        ~ResourceBase() = default;
     };
 
     template<class T>
@@ -214,4 +216,10 @@ namespace vcpkg::Util
             return e == E::YES;
         }
     }
+
+    template<class T>
+    void unused(T&& param)
+    {
+        (void)param;
+    }
 }
-- 
cgit v1.2.3