wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 17:31:47 +02:00
Code Activity

Don't use std::invocable C++ concept yet

Browse source 
It s not supported on all platforms yet. Can revert this once it is.
This commit is contained in:
John Ericson 2023-11-01 16:11:20 -04:00
parent b107431816
commit d15c3a33e6
2 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libutil/tests/characterization.hh
View file

@ -66,16 +66,12 @@ public:
* @param test hook that produces contents of the file and does the
* actual work
*/
template<typename T>
void writeTest(
PathView testStem,
std::invocable<> auto && test,
std::invocable<const Path &> auto && readFile2,
std::invocable<const Path &, const T &> auto && writeFile2)
PathView testStem, auto && test, auto && readFile2, auto && writeFile2)
{
auto file = goldenMaster(testStem);
T got = test();
auto got = test();
if (testAccept())
{
@ -87,7 +83,7 @@ public:
}
else
{
T expected = readFile2(file);
decltype(got) expected = readFile2(file);
ASSERT_EQ(got, expected);
}
}
@ -97,7 +93,7 @@ public:
*/
void writeTest(PathView testStem, auto && test)
{
writeTest<std::string>(
writeTest(
testStem, test,
[](const Path & f) -> std::string {
return readFile(f);