3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 19:25:27 +08:00
Code Issues Projects Releases Wiki Activity

Mark overridden functions with override. (#5585)

Browse Source 
* Update files.cpp

* Mark overrides with override.
This commit is contained in:
Peter Bright 2019-03-07 12:28:12 -05:00 committed by Griffin Downs
parent d92ad530a9
commit fd183d9ad1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolsrc/src/vcpkg/base/files.cpp
View File

@ -216,7 +216,7 @@ namespace vcpkg::Files
{ {
return fs::stdfs::copy_file(oldpath, newpath, opts, ec); return fs::stdfs::copy_file(oldpath, newpath, opts, ec);
} }
virtual void copy_symlink(const fs::path& oldpath, const fs::path& newpath, std::error_code& ec) virtual void copy_symlink(const fs::path& oldpath, const fs::path& newpath, std::error_code& ec) override
{ {
return fs::stdfs::copy_symlink(oldpath, newpath, ec); return fs::stdfs::copy_symlink(oldpath, newpath, ec);
} }

4
toolsrc/src/vcpkg/tools.cpp
View File

@ -364,7 +364,7 @@ Type 'NuGet help <command>' for help on a specific command.
virtual const std::string& exe_stem() const override { return m_exe; } virtual const std::string& exe_stem() const override { return m_exe; }
virtual std::array<int, 3> default_min_version() const override { return {2, 7, 4}; } virtual std::array<int, 3> default_min_version() const override { return {2, 7, 4}; }
virtual void add_special_paths(std::vector<fs::path>& out_candidate_paths) const virtual void add_special_paths(std::vector<fs::path>& out_candidate_paths) const override
{ {
#if defined(_WIN32) #if defined(_WIN32)
const auto& program_files = System::get_program_files_platform_bitness(); const auto& program_files = System::get_program_files_platform_bitness();
@ -403,7 +403,7 @@ git version 2.17.1.windows.2
virtual const std::string& exe_stem() const override { return m_exe; } virtual const std::string& exe_stem() const override { return m_exe; }
virtual std::array<int, 3> default_min_version() const override { return {0, 0, 0}; } virtual std::array<int, 3> default_min_version() const override { return {0, 0, 0}; }
virtual void add_special_paths(std::vector<fs::path>& out_candidate_paths) const virtual void add_special_paths(std::vector<fs::path>& out_candidate_paths) const override
{ {
// TODO: Uncomment later // TODO: Uncomment later
// const std::vector<fs::path> from_path = Files::find_from_PATH("installerbase"); // const std::vector<fs::path> from_path = Files::find_from_PATH("installerbase");