Merge branch 'master' into rdkafka-init

4 files changed, 10 insertions, 8 deletions

diff --git a/toolsrc/include/vcpkg/base/chrono.h b/toolsrc/include/vcpkg/base/chrono.h
index 26294fdf8..89cd15273 100644
--- a/toolsrc/include/vcpkg/base/chrono.h
+++ b/toolsrc/include/vcpkg/base/chrono.h
@@ -56,8 +56,8 @@ namespace vcpkg::Chrono
         static Optional<CTime> get_current_date_time();
         static Optional<CTime> parse(CStringView str);
 
-        constexpr CTime() noexcept : m_tm {0} {}
-        explicit constexpr CTime(tm t) noexcept : m_tm {t} {}
+        constexpr CTime() noexcept : m_tm{0} {}
+        explicit constexpr CTime(tm t) noexcept : m_tm{t} {}
 
         CTime add_hours(const int hours) const;
 
diff --git a/toolsrc/include/vcpkg/base/strings.h b/toolsrc/include/vcpkg/base/strings.h
index 3165dc8ee..3a9de97df 100644
--- a/toolsrc/include/vcpkg/base/strings.h
+++ b/toolsrc/include/vcpkg/base/strings.h
@@ -43,7 +43,7 @@ namespace vcpkg::Strings::details
         t.to_string(into);
     }
 
-    template<class T, class=void, class = decltype(to_string(std::declval<std::string&>(), std::declval<const T&>()))>
+    template<class T, class = void, class = decltype(to_string(std::declval<std::string&>(), std::declval<const T&>()))>
     void append_internal(std::string& into, const T& t)
     {
         to_string(into, t);
@@ -66,7 +66,8 @@ namespace vcpkg::Strings
     }
 
     template<class... Args>
-    [[nodiscard]] std::string concat(const Args&... args) {
+    [[nodiscard]] std::string concat(const Args&... args)
+    {
         std::string ret;
         append(ret, args...);
         return ret;
@@ -113,8 +114,7 @@ namespace vcpkg::Strings
     bool starts_with(StringView s, StringView pattern);
 
     template<class InputIterator, class Transformer>
-    std::string join(const char* delimiter, InputIterator begin, InputIterator end,
-                     Transformer transformer)
+    std::string join(const char* delimiter, InputIterator begin, InputIterator end, Transformer transformer)
     {
         if (begin == end)
         {
@@ -145,8 +145,7 @@ namespace vcpkg::Strings
     std::string join(const char* delimiter, InputIterator begin, InputIterator end)
     {
         using Element = decltype(*begin);
-        return join(delimiter, begin, end,
-                    [](const Element& x) -> const Element& { return x; });
+        return join(delimiter, begin, end, [](const Element& x) -> const Element& { return x; });
     }
 
     template<class Container>
diff --git a/toolsrc/include/vcpkg/base/system.h b/toolsrc/include/vcpkg/base/system.h
index 0245b684a..907a692a2 100644
--- a/toolsrc/include/vcpkg/base/system.h
+++ b/toolsrc/include/vcpkg/base/system.h
@@ -28,4 +28,6 @@ namespace vcpkg::System
     const Optional<fs::path>& get_program_files_32_bit();
 
     const Optional<fs::path>& get_program_files_platform_bitness();
+
+    int get_num_logical_cores();
 }
diff --git a/toolsrc/include/vcpkg/sourceparagraph.h b/toolsrc/include/vcpkg/sourceparagraph.h
index ae5812ea7..d70fd4337 100644
--- a/toolsrc/include/vcpkg/sourceparagraph.h
+++ b/toolsrc/include/vcpkg/sourceparagraph.h
@@ -48,6 +48,7 @@ namespace vcpkg
         std::string version;
         std::string description;
         std::string maintainer;
+        std::string homepage;
         std::vector<std::string> supports;
         std::vector<Dependency> depends;
         std::vector<std::string> default_features;