diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-10-13 18:50:12 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-10-13 18:50:12 -0700 |
| commit | a790820e8cdf9adca3e5cf066b8a563a3beaacd1 (patch) | |
| tree | 293a786398d109ca316fc89d2f128fd80d7d5f56 /toolsrc/include | |
| parent | e17de99599a2f114faab1bb4821fbaad4d266c95 (diff) | |
| parent | 2397cc044ee56160757aeb402dc7adaec6b00894 (diff) | |
| download | vcpkg-a790820e8cdf9adca3e5cf066b8a563a3beaacd1.tar.gz vcpkg-a790820e8cdf9adca3e5cf066b8a563a3beaacd1.zip | |
[vcpkg] Merge from master into refactor-includes
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg/vcpkgpaths.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h index df4adfd83..fb9285a84 100644 --- a/toolsrc/include/vcpkg/vcpkgpaths.h +++ b/toolsrc/include/vcpkg/vcpkgpaths.h @@ -68,8 +68,8 @@ namespace vcpkg /// <remarks> /// Valid version strings are "v140", "v141", and "". Empty string gets the latest. /// </remarks> - const Toolset& VcpkgPaths::get_toolset(const Optional<std::string>& toolset_version, - const Optional<fs::path>& visual_studio_path) const; + const Toolset& get_toolset(const Optional<std::string>& toolset_version, + const Optional<fs::path>& visual_studio_path) const; Files::Filesystem& get_filesystem() const; |