diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-03 16:28:18 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-04 16:44:45 -0700 |
| commit | 402552ef934d30c923e633daadc59ff853115df2 (patch) | |
| tree | 0fa81af04d846bb0ddb672767f9892bcf77728bd /toolsrc/src/vcpkg_paths.cpp | |
| parent | 95428f53691d232d961bb136f35d096967d38d5f (diff) | |
| download | vcpkg-402552ef934d30c923e633daadc59ff853115df2.tar.gz vcpkg-402552ef934d30c923e633daadc59ff853115df2.zip | |
toolset_t -> Toolset
Diffstat (limited to 'toolsrc/src/vcpkg_paths.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg_paths.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toolsrc/src/vcpkg_paths.cpp b/toolsrc/src/vcpkg_paths.cpp index 16ab44fd8..ece12562e 100644 --- a/toolsrc/src/vcpkg_paths.cpp +++ b/toolsrc/src/vcpkg_paths.cpp @@ -262,7 +262,7 @@ namespace vcpkg return nullopt; } - static toolset_t find_toolset_instance(const vcpkg_paths& paths) + static Toolset find_toolset_instance(const vcpkg_paths& paths) { const std::vector<std::string> vs2017_installation_instances = get_VS2017_installation_instances(paths); // Note: this will contain a mix of vcvarsall.bat locations and dumpbin.exe locations. @@ -331,7 +331,7 @@ namespace vcpkg Checks::exit_fail(VCPKG_LINE_INFO); } - const toolset_t& vcpkg_paths::get_toolset() const + const Toolset& vcpkg_paths::get_toolset() const { return this->toolset.get_lazy([this]() { return find_toolset_instance(*this); }); } |