Skip to content

Commit 94a0221

Browse files
committed
Rework lambda to pass MSVC and GCC
MSVC thinks you need the capture, GCC thinks the capture is not needed, so pass variable directly into the lambda function call. Ugly to pass several booleans, but should work. Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>
1 parent ec3e761 commit 94a0221

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

tests/cpu/OCIOZArchive_tests.cpp

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ OCIO_ADD_TEST(OCIOZArchive, is_config_archivable)
171171
cfg->clearSearchPaths();
172172

173173
// Lambda function to facilitate adding a new FileTransform to a config.
174-
auto addFTAndTestIsArchivable = [&cfg, &minimal](const std::string & path, bool isArchivable)
174+
auto addFTAndTestIsArchivable = [&cfg](const std::string & path, bool isArchivable, bool minimal)
175175
{
176176
std::string fullPath = pystring::os::path::join(path, "fake_lut.clf");
177177
auto ft = OCIO::FileTransform::Create();
@@ -194,41 +194,41 @@ OCIO_ADD_TEST(OCIOZArchive, is_config_archivable)
194194
*/
195195

196196
// Valid FileTransform path.
197-
addFTAndTestIsArchivable("luts", true);
198-
addFTAndTestIsArchivable(R"(luts/myluts1)", true);
199-
addFTAndTestIsArchivable(R"(luts\myluts1)", true);
197+
addFTAndTestIsArchivable("luts", true, false);
198+
addFTAndTestIsArchivable(R"(luts/myluts1)", true, false);
199+
addFTAndTestIsArchivable(R"(luts\myluts1)", true, false);
200200

201201
// Valid Search path starting with "./" or ".\".
202-
addFTAndTestIsArchivable(R"(./myLuts)", true);
203-
addFTAndTestIsArchivable(R"(.\myLuts)", true);
202+
addFTAndTestIsArchivable(R"(./myLuts)", true, false);
203+
addFTAndTestIsArchivable(R"(.\myLuts)", true, false);
204204

205205
// Valid search path starting with "./" or ".\" and a context variable.
206-
addFTAndTestIsArchivable(R"(./$SHOT/myluts)", true);
207-
addFTAndTestIsArchivable(R"(.\$SHOT\myluts)", true);
208-
addFTAndTestIsArchivable(R"(luts/$SHOT)", true);
209-
addFTAndTestIsArchivable(R"(luts/$SHOT/luts1)", true);
210-
addFTAndTestIsArchivable(R"(luts\$SHOT)", true);
211-
addFTAndTestIsArchivable(R"(luts\$SHOT\luts1)", true);
206+
addFTAndTestIsArchivable(R"(./$SHOT/myluts)", true, false);
207+
addFTAndTestIsArchivable(R"(.\$SHOT\myluts)", true, false);
208+
addFTAndTestIsArchivable(R"(luts/$SHOT)", true, false);
209+
addFTAndTestIsArchivable(R"(luts/$SHOT/luts1)", true, false);
210+
addFTAndTestIsArchivable(R"(luts\$SHOT)", true, false);
211+
addFTAndTestIsArchivable(R"(luts\$SHOT\luts1)", true, false);
212212

213213
/*
214214
* Illegal scenarios
215215
*/
216216

217217
// Illegal search path starting with "..".
218-
addFTAndTestIsArchivable(R"(../luts)", false);
219-
addFTAndTestIsArchivable(R"(..\myLuts)", false);
218+
addFTAndTestIsArchivable(R"(../luts)", false, false);
219+
addFTAndTestIsArchivable(R"(..\myLuts)", false, false);
220220

221221
// Illegal search path starting with a context variable.
222-
addFTAndTestIsArchivable(R"($SHOT)", false);
222+
addFTAndTestIsArchivable(R"($SHOT)", false, false);
223223

224224
// Illegal search path with absolute path.
225-
addFTAndTestIsArchivable(R"(/luts)", false);
226-
addFTAndTestIsArchivable(R"(/$SHOT)", false);
225+
addFTAndTestIsArchivable(R"(/luts)", false, false);
226+
addFTAndTestIsArchivable(R"(/$SHOT)", false, false);
227227

228228
#ifdef _WIN32
229-
addFTAndTestIsArchivable(R"(C:\luts)", false);
230-
addFTAndTestIsArchivable(R"(C:\)", false);
231-
addFTAndTestIsArchivable(R"(\$SHOT)", false);
229+
addFTAndTestIsArchivable(R"(C:\luts)", false, false);
230+
addFTAndTestIsArchivable(R"(C:\)", false, false);
231+
addFTAndTestIsArchivable(R"(\$SHOT)", false, false);
232232
#endif
233233
}
234234
}

0 commit comments

Comments
 (0)