aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/include
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-04-03 16:28:18 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-04-04 16:44:45 -0700
commit402552ef934d30c923e633daadc59ff853115df2 (patch)
tree0fa81af04d846bb0ddb672767f9892bcf77728bd /toolsrc/include
parent95428f53691d232d961bb136f35d096967d38d5f (diff)
downloadvcpkg-402552ef934d30c923e633daadc59ff853115df2.tar.gz
vcpkg-402552ef934d30c923e633daadc59ff853115df2.zip
toolset_t -> Toolset
Diffstat (limited to 'toolsrc/include')
-rw-r--r--toolsrc/include/vcpkg_Commands.h2
-rw-r--r--toolsrc/include/vcpkg_paths.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h
index 0cdd2d9d0..6adfb5656 100644
--- a/toolsrc/include/vcpkg_Commands.h
+++ b/toolsrc/include/vcpkg_Commands.h
@@ -29,7 +29,7 @@ namespace vcpkg::Commands
std::string create_error_message(const BuildResult build_result, const PackageSpec& spec);
std::string create_user_troubleshooting_message(const PackageSpec& spec);
- std::wstring make_build_env_cmd(const Triplet& target_triplet, const toolset_t& toolset);
+ std::wstring make_build_env_cmd(const Triplet& target_triplet, const Toolset& toolset);
BuildResult build_package(const SourceParagraph& source_paragraph, const PackageSpec& spec, const vcpkg_paths& paths, const fs::path& port_dir, const StatusParagraphs& status_db);
void perform_and_exit(const PackageSpec& spec, const fs::path& port_dir, const std::unordered_set<std::string>& options, const vcpkg_paths& paths);
diff --git a/toolsrc/include/vcpkg_paths.h b/toolsrc/include/vcpkg_paths.h
index 58b75fb54..bc966ac6d 100644
--- a/toolsrc/include/vcpkg_paths.h
+++ b/toolsrc/include/vcpkg_paths.h
@@ -7,7 +7,7 @@
namespace vcpkg
{
- struct toolset_t
+ struct Toolset
{
fs::path dumpbin;
fs::path vcvarsall;
@@ -47,12 +47,12 @@ namespace vcpkg
const fs::path& get_cmake_exe() const;
const fs::path& get_git_exe() const;
const fs::path& get_nuget_exe() const;
- const toolset_t& get_toolset() const;
+ const Toolset& get_toolset() const;
private:
Lazy<fs::path> cmake_exe;
Lazy<fs::path> git_exe;
Lazy<fs::path> nuget_exe;
- Lazy<toolset_t> toolset;
+ Lazy<Toolset> toolset;
};
}