aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-08-28 19:32:07 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-08-28 19:54:01 -0700
commit03c4c7f8c49d103f57fe12899526b27fc8ccc452 (patch)
treecfc72900606995346a987ad25766912d96e959ab
parent6684240090512f745bf7530b2fb4bcd31c3fb02e (diff)
downloadvcpkg-03c4c7f8c49d103f57fe12899526b27fc8ccc452.tar.gz
vcpkg-03c4c7f8c49d103f57fe12899526b27fc8ccc452.zip
Use System::println() with no args
-rw-r--r--toolsrc/src/PostBuildLint.cpp16
-rw-r--r--toolsrc/src/commands_build.cpp4
-rw-r--r--toolsrc/src/commands_install.cpp2
-rw-r--r--toolsrc/src/vcpkg_Files.cpp4
4 files changed, 13 insertions, 13 deletions
diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp
index a5d923ad2..473c81cfa 100644
--- a/toolsrc/src/PostBuildLint.cpp
+++ b/toolsrc/src/PostBuildLint.cpp
@@ -10,9 +10,9 @@
#include "vcpkg_System.h"
#include "vcpkg_Util.h"
-using vcpkg::Build::PreBuildInfo;
using vcpkg::Build::BuildInfo;
using vcpkg::Build::BuildPolicy;
+using vcpkg::Build::PreBuildInfo;
namespace vcpkg::PostBuildLint
{
@@ -369,12 +369,12 @@ namespace vcpkg::PostBuildLint
std::vector<FileAndArch> binaries_with_invalid_architecture)
{
System::println(System::Color::warning, "The following files were built for an incorrect architecture:");
- System::println("");
+ System::println();
for (const FileAndArch& b : binaries_with_invalid_architecture)
{
System::println(" %s", b.file.generic_string());
System::println("Expected %s, but was: %s", expected_architecture, b.actual_arch);
- System::println("");
+ System::println();
}
}
@@ -487,7 +487,7 @@ namespace vcpkg::PostBuildLint
System::println(System::Color::warning, "Release binaries were not found");
}
- System::println("");
+ System::println();
return LintStatus::ERROR_DETECTED;
}
@@ -621,12 +621,12 @@ namespace vcpkg::PostBuildLint
System::println(System::Color::warning,
"Expected %s crt linkage, but the following libs had invalid crt linkage:",
expected_build_type.to_string());
- System::println("");
+ System::println();
for (const BuildType_and_file btf : libs_with_invalid_crt)
{
System::println(" %s: %s", btf.file.generic_string(), btf.build_type.to_string());
}
- System::println("");
+ System::println();
System::println(System::Color::warning,
"To inspect the lib files, use:\n dumpbin.exe /directives mylibfile.lib");
@@ -675,12 +675,12 @@ namespace vcpkg::PostBuildLint
if (!dlls_with_outdated_crt.empty())
{
System::println(System::Color::warning, "Detected outdated dynamic CRT in the following files:");
- System::println("");
+ System::println();
for (const OutdatedDynamicCrt_and_file btf : dlls_with_outdated_crt)
{
System::println(" %s: %s", btf.file.generic_string(), btf.outdated_crt.name);
}
- System::println("");
+ System::println();
System::println(System::Color::warning,
"To inspect the dll files, use:\n dumpbin.exe /dependents mydllfile.dll");
diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp
index 421568ce5..26a783a4b 100644
--- a/toolsrc/src/commands_build.cpp
+++ b/toolsrc/src/commands_build.cpp
@@ -68,12 +68,12 @@ namespace vcpkg::Commands::BuildCommand
System::println(System::Color::error,
"The build command requires all dependencies to be already installed.");
System::println("The following dependencies are missing:");
- System::println(Strings::EMPTY);
+ System::println();
for (const auto& p : result.unmet_dependencies)
{
System::println(" %s", p);
}
- System::println(Strings::EMPTY);
+ System::println();
Checks::exit_fail(VCPKG_LINE_INFO);
}
diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp
index 1c474f7b0..8b1eec5eb 100644
--- a/toolsrc/src/commands_install.cpp
+++ b/toolsrc/src/commands_install.cpp
@@ -199,7 +199,7 @@ namespace vcpkg::Commands::Install
bcf.core_paragraph.spec);
System::print("\n ");
System::println(Strings::join("\n ", intersection));
- System::println(Strings::EMPTY);
+ System::println();
return InstallResult::FILE_CONFLICTS;
}
diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp
index 29da7e684..24edb779f 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg_Files.cpp
@@ -186,11 +186,11 @@ namespace vcpkg::Files
void print_paths(const std::vector<fs::path>& paths)
{
- System::println("");
+ System::println();
for (const fs::path& p : paths)
{
System::println(" %s", p.generic_string());
}
- System::println("");
+ System::println();
}
}