diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-03 16:18:21 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-04 16:44:43 -0700 |
| commit | cbc2b08ad1a2bd7fe39a50ed00871f75585d0e02 (patch) | |
| tree | 1b7fb19efaef270caa705e6c396fbefaff56b0dd | |
| parent | b766a005b7a67d7adeadc16e765bda34d679f45d (diff) | |
| download | vcpkg-cbc2b08ad1a2bd7fe39a50ed00871f75585d0e02.tar.gz vcpkg-cbc2b08ad1a2bd7fe39a50ed00871f75585d0e02.zip | |
version_diff_t -> VersionDiff
| -rw-r--r-- | toolsrc/include/VersionT.cpp | 6 | ||||
| -rw-r--r-- | toolsrc/include/VersionT.h | 6 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg_Commands.h | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_portsdiff.cpp | 4 | ||||
| -rw-r--r-- | toolsrc/src/commands_update.cpp | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/toolsrc/include/VersionT.cpp b/toolsrc/include/VersionT.cpp index 617fa23c7..50dc12693 100644 --- a/toolsrc/include/VersionT.cpp +++ b/toolsrc/include/VersionT.cpp @@ -10,10 +10,10 @@ namespace vcpkg bool operator!=(const VersionT& left, const VersionT& right) { return left.value != right.value; } std::string to_printf_arg(const VersionT& version) { return version.value; } - version_diff_t::version_diff_t() : left(), right() {} - version_diff_t::version_diff_t(const VersionT& left, const VersionT& right) : left(left), right(right) {} + VersionDiff::VersionDiff() : left(), right() {} + VersionDiff::VersionDiff(const VersionT& left, const VersionT& right) : left(left), right(right) {} - std::string version_diff_t::toString() const + std::string VersionDiff::toString() const { return Strings::format("%s -> %s", left.value, right.value); } diff --git a/toolsrc/include/VersionT.h b/toolsrc/include/VersionT.h index f02479f46..06fc6ee2f 100644 --- a/toolsrc/include/VersionT.h +++ b/toolsrc/include/VersionT.h @@ -15,13 +15,13 @@ namespace vcpkg bool operator !=(const VersionT& left, const VersionT& right); std::string to_printf_arg(const VersionT& version); - struct version_diff_t + struct VersionDiff { VersionT left; VersionT right; - version_diff_t(); - version_diff_t(const VersionT& left, const VersionT& right); + VersionDiff(); + VersionDiff(const VersionT& left, const VersionT& right); std::string toString() const; }; diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h index 6bdc7d10e..c6473fa8b 100644 --- a/toolsrc/include/vcpkg_Commands.h +++ b/toolsrc/include/vcpkg_Commands.h @@ -64,7 +64,7 @@ namespace vcpkg::Commands static bool compare_by_name(const OutdatedPackage& left, const OutdatedPackage& right); PackageSpec spec; - version_diff_t version_diff; + VersionDiff version_diff; }; std::vector<OutdatedPackage> find_outdated_packages(const vcpkg_paths& paths, const StatusParagraphs& status_db); diff --git a/toolsrc/src/commands_portsdiff.cpp b/toolsrc/src/commands_portsdiff.cpp index c1110b522..e5155a49d 100644 --- a/toolsrc/src/commands_portsdiff.cpp +++ b/toolsrc/src/commands_portsdiff.cpp @@ -16,7 +16,7 @@ namespace vcpkg::Commands::PortsDiff } std::string port; - version_diff_t version_diff; + VersionDiff version_diff; }; template <class T> @@ -52,7 +52,7 @@ namespace vcpkg::Commands::PortsDiff continue; } - output.push_back({ name, version_diff_t(previous_version, current_version) }); + output.push_back({ name, VersionDiff(previous_version, current_version) }); } return output; diff --git a/toolsrc/src/commands_update.cpp b/toolsrc/src/commands_update.cpp index 845813488..159a62446 100644 --- a/toolsrc/src/commands_update.cpp +++ b/toolsrc/src/commands_update.cpp @@ -29,7 +29,7 @@ namespace vcpkg::Commands::Update } if (it->second != pgh->package.version) { - output.push_back({ pgh->package.spec, version_diff_t(pgh->package.version, it->second) }); + output.push_back({ pgh->package.spec, VersionDiff(pgh->package.version, it->second) }); } } |