aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/include/tests.utils.h
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2019-06-19 11:49:57 -0700
committerGitHub <noreply@github.com>2019-06-19 11:49:57 -0700
commite5b92a39116791cfd4e1f4931221c9f69125bae3 (patch)
tree6f868340680f87b5e673688ffcdae8ea8351c8ea /toolsrc/include/tests.utils.h
parentdf0b8d9e55bfb6772a9e5c02fd826ab520e5d2f8 (diff)
downloadvcpkg-e5b92a39116791cfd4e1f4931221c9f69125bae3.tar.gz
vcpkg-e5b92a39116791cfd4e1f4931221c9f69125bae3.zip
[vcpkg] Improve vcpkg::Files::Filesystem error handling (#6919)
* [vcpkg] Modify Filesystem::remove and Filesystem::rename to not throw. * [.gitignore] Ignore new VS2019 CMake integration default location * [.gitignore] Ignore CMakeSettings.json in toolsrc * [vcpkg] Time external processes called with System::cmd_execute * [vcpkg] Work around VS2019 CMake bug * [vcpkg] Fix several unused variable warnings. * [vcpkg] Improve error handling in vcpkg::Files::Filesystem Always require either std::error_code or LineInfo to print better errors. * [vcpkg] Fixup missing return value. Drive by fix: silence warnings in tests. * [vcpkg] Fix exiting in error_code overload Drive by fixes for /analyze with VS2019
Diffstat (limited to 'toolsrc/include/tests.utils.h')
-rw-r--r--toolsrc/include/tests.utils.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/toolsrc/include/tests.utils.h b/toolsrc/include/tests.utils.h
index 7f7ec9e88..3e8514e67 100644
--- a/toolsrc/include/tests.utils.h
+++ b/toolsrc/include/tests.utils.h
@@ -13,7 +13,7 @@
namespace Microsoft::VisualStudio::CppUnitTestFramework
{
template<>
- std::wstring ToString<vcpkg::Dependencies::InstallPlanType>(const vcpkg::Dependencies::InstallPlanType& t)
+ inline std::wstring ToString<vcpkg::Dependencies::InstallPlanType>(const vcpkg::Dependencies::InstallPlanType& t)
{
switch (t)
{
@@ -26,7 +26,7 @@ namespace Microsoft::VisualStudio::CppUnitTestFramework
}
template<>
- std::wstring ToString<vcpkg::Dependencies::RequestType>(const vcpkg::Dependencies::RequestType& t)
+ inline std::wstring ToString<vcpkg::Dependencies::RequestType>(const vcpkg::Dependencies::RequestType& t)
{
switch (t)
{
@@ -38,13 +38,13 @@ namespace Microsoft::VisualStudio::CppUnitTestFramework
}
template<>
- std::wstring ToString<vcpkg::PackageSpecParseResult>(const vcpkg::PackageSpecParseResult& t)
+ inline std::wstring ToString<vcpkg::PackageSpecParseResult>(const vcpkg::PackageSpecParseResult& t)
{
return ToString(static_cast<uint32_t>(t));
}
template<>
- std::wstring ToString<vcpkg::PackageSpec>(const vcpkg::PackageSpec& t)
+ inline std::wstring ToString<vcpkg::PackageSpec>(const vcpkg::PackageSpec& t)
{
return ToString(t.to_string());
}