From 7d9d457f589d82d6675c511636808a0fbee7a4e5 Mon Sep 17 00:00:00 2001
From: "Curtis.Bezault" <curtbezault@gmail.com>
Date: Tue, 16 Jul 2019 16:09:30 -0700
Subject: [PATCH] revert unecessary reordering

---
 toolsrc/include/vcpkg/build.h | 92 +++++++++++++++++------------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h
index 0d10d12a4f..a0ad64ffd6 100644
--- a/toolsrc/include/vcpkg/build.h
+++ b/toolsrc/include/vcpkg/build.h
@@ -117,28 +117,53 @@ namespace vcpkg::Build
     std::string create_error_message(const BuildResult build_result, const PackageSpec& spec);
     std::string create_user_troubleshooting_message(const PackageSpec& spec);
 
-   enum class VcpkgTripletVar
-   {
-       TARGET_ARCHITECTURE = 0,
-       CMAKE_SYSTEM_NAME,
-       CMAKE_SYSTEM_VERSION,
-       PLATFORM_TOOLSET,
-       VISUAL_STUDIO_PATH,
-       CHAINLOAD_TOOLCHAIN_FILE,
-       BUILD_TYPE,
-       ENV_PASSTHROUGH,
-   };
+    /// <summary>
+    /// Settings from the triplet file which impact the build environment and post-build checks
+    /// </summary>
+    struct PreBuildInfo
+    {
+        /// <summary>
+        /// Runs the triplet file in a "capture" mode to create a PreBuildInfo
+        /// </summary>
+        static PreBuildInfo from_triplet_file(const VcpkgPaths& paths,
+                const Triplet& triplet,
+                Optional<const std::string&> port = nullopt);
 
-   const std::unordered_map<std::string, VcpkgTripletVar> VCPKG_OPTIONS = {
-       {"VCPKG_TARGET_ARCHITECTURE", VcpkgTripletVar::TARGET_ARCHITECTURE},
-       {"VCPKG_CMAKE_SYSTEM_NAME", VcpkgTripletVar::CMAKE_SYSTEM_NAME},
-       {"VCPKG_CMAKE_SYSTEM_VERSION", VcpkgTripletVar::CMAKE_SYSTEM_VERSION},
-       {"VCPKG_PLATFORM_TOOLSET", VcpkgTripletVar::PLATFORM_TOOLSET},
-       {"VCPKG_VISUAL_STUDIO_PATH", VcpkgTripletVar::VISUAL_STUDIO_PATH},
-       {"VCPKG_CHAINLOAD_TOOLCHAIN_FILE", VcpkgTripletVar::CHAINLOAD_TOOLCHAIN_FILE},
-       {"VCPKG_BUILD_TYPE", VcpkgTripletVar::BUILD_TYPE},
-       {"VCPKG_ENV_PASSTHROUGH", VcpkgTripletVar::ENV_PASSTHROUGH},
-   };
+        std::string triplet_abi_tag;
+        std::string target_architecture;
+        std::string cmake_system_name;
+        std::string cmake_system_version;
+        Optional<std::string> platform_toolset;
+        Optional<fs::path> visual_studio_path;
+        Optional<std::string> external_toolchain_file;
+        Optional<ConfigurationType> build_type;
+        std::vector<std::string> passthrough_env_vars;
+    };
+
+    std::string make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset);
+
+    enum class VcpkgTripletVar
+    {
+        TARGET_ARCHITECTURE = 0,
+        CMAKE_SYSTEM_NAME,
+        CMAKE_SYSTEM_VERSION,
+        PLATFORM_TOOLSET,
+        VISUAL_STUDIO_PATH,
+        CHAINLOAD_TOOLCHAIN_FILE,
+        BUILD_TYPE,
+        ENV_PASSTHROUGH,
+    };
+
+    const std::unordered_map<std::string, VcpkgTripletVar> VCPKG_OPTIONS = {
+        {"VCPKG_TARGET_ARCHITECTURE", VcpkgTripletVar::TARGET_ARCHITECTURE},
+        {"VCPKG_CMAKE_SYSTEM_NAME", VcpkgTripletVar::CMAKE_SYSTEM_NAME},
+        {"VCPKG_CMAKE_SYSTEM_VERSION", VcpkgTripletVar::CMAKE_SYSTEM_VERSION},
+        {"VCPKG_PLATFORM_TOOLSET", VcpkgTripletVar::PLATFORM_TOOLSET},
+        {"VCPKG_VISUAL_STUDIO_PATH", VcpkgTripletVar::VISUAL_STUDIO_PATH},
+        {"VCPKG_CHAINLOAD_TOOLCHAIN_FILE", VcpkgTripletVar::CHAINLOAD_TOOLCHAIN_FILE},
+        {"VCPKG_BUILD_TYPE", VcpkgTripletVar::BUILD_TYPE},
+        {"VCPKG_ENV_PASSTHROUGH", VcpkgTripletVar::ENV_PASSTHROUGH},
+    };
 
     struct ExtendedBuildResult
     {
@@ -177,31 +202,6 @@ namespace vcpkg::Build
                                       const BuildPackageConfig& config,
                                       const StatusParagraphs& status_db);
 
-    /// <summary>
-    /// Settings from the triplet file which impact the build environment and post-build checks
-    /// </summary>
-    struct PreBuildInfo
-    {
-        /// <summary>
-        /// Runs the triplet file in a "capture" mode to create a PreBuildInfo
-        /// </summary>
-        static PreBuildInfo from_triplet_file(const VcpkgPaths& paths,
-                const Triplet& triplet,
-                Optional<const std::string&> port = nullopt);
-
-        std::string triplet_abi_tag;
-        std::string target_architecture;
-        std::string cmake_system_name;
-        std::string cmake_system_version;
-        Optional<std::string> platform_toolset;
-        Optional<fs::path> visual_studio_path;
-        Optional<std::string> external_toolchain_file;
-        Optional<ConfigurationType> build_type;
-        std::vector<std::string> passthrough_env_vars;
-    };
-
-    std::string make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset);
-
     enum class BuildPolicy
     {
         EMPTY_PACKAGE,