diff options
| author | Peter Bright <drpizza@quiscalusmexicanus.org> | 2019-03-07 12:28:12 -0500 |
|---|---|---|
| committer | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-03-07 09:28:12 -0800 |
| commit | fd183d9ad189199413800370c8c3d8858b903a22 (patch) | |
| tree | c01012efe3733ca52c82200f2ca2de8cb481c725 /toolsrc/src | |
| parent | d92ad530a99508e028de261eb13ad2319dbea3c4 (diff) | |
| download | vcpkg-fd183d9ad189199413800370c8c3d8858b903a22.tar.gz vcpkg-fd183d9ad189199413800370c8c3d8858b903a22.zip | |
Mark overridden functions with override. (#5585)
* Update files.cpp
* Mark overrides with override.
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/vcpkg/base/files.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg/tools.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/toolsrc/src/vcpkg/base/files.cpp b/toolsrc/src/vcpkg/base/files.cpp index f9bce8631..1740b6f6d 100644 --- a/toolsrc/src/vcpkg/base/files.cpp +++ b/toolsrc/src/vcpkg/base/files.cpp @@ -216,7 +216,7 @@ namespace vcpkg::Files { 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); } diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index b713b2752..99a2f4fb8 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -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 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) 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 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 // const std::vector<fs::path> from_path = Files::find_from_PATH("installerbase"); |