mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 01:24:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix #3170 issue with /permissive-

Browse Source
This commit is contained in:
Alexander Karatarakis 2018-04-25 18:14:24 -07:00
parent 56d394e097
commit 9167511656
3 changed files with 36 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
toolsrc/include/tests.utils.h
View File

@ -12,10 +12,42 @@
namespace Microsoft::VisualStudio::CppUnitTestFramework namespace Microsoft::VisualStudio::CppUnitTestFramework
{ {
std::wstring ToString(const vcpkg::Dependencies::InstallPlanType& t); template<>
std::wstring ToString(const vcpkg::Dependencies::RequestType& t); std::wstring ToString<vcpkg::Dependencies::InstallPlanType>(const vcpkg::Dependencies::InstallPlanType& t)
std::wstring ToString(const vcpkg::PackageSpecParseResult& t); {
std::wstring ToString(const vcpkg::PackageSpec& t); switch (t)
{
case vcpkg::Dependencies::InstallPlanType::ALREADY_INSTALLED: return L"ALREADY_INSTALLED";
case vcpkg::Dependencies::InstallPlanType::BUILD_AND_INSTALL: return L"BUILD_AND_INSTALL";
case vcpkg::Dependencies::InstallPlanType::EXCLUDED: return L"EXCLUDED";
case vcpkg::Dependencies::InstallPlanType::UNKNOWN: return L"UNKNOWN";
default: return ToString(static_cast<int>(t));
}
}
template<>
std::wstring ToString<vcpkg::Dependencies::RequestType>(const vcpkg::Dependencies::RequestType& t)
{
switch (t)
{
case vcpkg::Dependencies::RequestType::AUTO_SELECTED: return L"AUTO_SELECTED";
case vcpkg::Dependencies::RequestType::USER_REQUESTED: return L"USER_REQUESTED";
case vcpkg::Dependencies::RequestType::UNKNOWN: return L"UNKNOWN";
default: return ToString(static_cast<int>(t));
}
}
template<>
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)
{
return ToString(t.to_string());
}
} }
std::unique_ptr<vcpkg::StatusParagraph> make_status_pgh(const char* name, std::unique_ptr<vcpkg::StatusParagraph> make_status_pgh(const char* name,

9
toolsrc/src/tests.paragraph.cpp
View File

@ -5,15 +5,6 @@
using namespace Microsoft::VisualStudio::CppUnitTestFramework; using namespace Microsoft::VisualStudio::CppUnitTestFramework;
namespace Microsoft::VisualStudio::CppUnitTestFramework
{
template<>
inline std::wstring ToString<vcpkg::PackageSpecParseResult>(const vcpkg::PackageSpecParseResult& t)
{
return ToString(static_cast<uint32_t>(t));
}
}
namespace Strings = vcpkg::Strings; namespace Strings = vcpkg::Strings;
namespace UnitTest1 namespace UnitTest1

30
toolsrc/src/tests.utils.cpp
View File

@ -5,36 +5,6 @@
using namespace Microsoft::VisualStudio::CppUnitTestFramework; using namespace Microsoft::VisualStudio::CppUnitTestFramework;
using namespace vcpkg; using namespace vcpkg;
namespace Microsoft::VisualStudio::CppUnitTestFramework
{
std::wstring ToString(const vcpkg::Dependencies::InstallPlanType& t)
{
switch (t)
{
case Dependencies::InstallPlanType::ALREADY_INSTALLED: return L"ALREADY_INSTALLED";
case Dependencies::InstallPlanType::BUILD_AND_INSTALL: return L"BUILD_AND_INSTALL";
case Dependencies::InstallPlanType::EXCLUDED: return L"EXCLUDED";
case Dependencies::InstallPlanType::UNKNOWN: return L"UNKNOWN";
default: return ToString(static_cast<int>(t));
}
}
std::wstring ToString(const vcpkg::Dependencies::RequestType& t)
{
switch (t)
{
case Dependencies::RequestType::AUTO_SELECTED: return L"AUTO_SELECTED";
case Dependencies::RequestType::USER_REQUESTED: return L"USER_REQUESTED";
case Dependencies::RequestType::UNKNOWN: return L"UNKNOWN";
default: return ToString(static_cast<int>(t));
}
}
std::wstring ToString(const vcpkg::PackageSpecParseResult& t) { return ToString(static_cast<uint32_t>(t)); }
std::wstring ToString(const vcpkg::PackageSpec& t) { return ToString(t.to_string()); }
}
std::unique_ptr<StatusParagraph> make_status_pgh(const char* name, std::unique_ptr<StatusParagraph> make_status_pgh(const char* name,
const char* depends, const char* depends,
const char* default_features, const char* default_features,