Skip to content

testlib: backport fix for #1056 #1127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 10, 2021
Merged

testlib: backport fix for #1056 #1127

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions cmscontrib/loaders/polygon/testlib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@
* - Add the "CMS_VERBOSE_FEEDBACK" conditional macro to enable
* testlib-style messages
* - Interactors are not supported
*
* Backports:
* - 1bcfacc3a97667b38a3aef9d95b97edc6a9db688 (MikeMirzayanov/testlib#79)
*/

/* NOTE: This file contains testlib library for C++.
Expand All @@ -79,6 +82,7 @@
*/

const char* latestFeatures[] = {
"Fixed issue #79: fixed missed guard against repeated header include",
"Fixed stringstream repeated usage issue",
"Fixed compilation in g++ (for std=c++03)",
"Batch of println functions (support collections, iterator ranges)",
Expand Down Expand Up @@ -4564,8 +4568,6 @@ NORETURN void expectedButFound<long double>(TResult result, long double expected
__testlib_expectedButFound(result, double(expected), double(found), prepend.c_str());
}

#endif

#if __cplusplus > 199711L || defined(_MSC_VER)
template <typename T>
struct is_iterable
Expand Down Expand Up @@ -4755,3 +4757,4 @@ void println(const A& a, const B& b, const C& c, const D& d, const E& e, const F
std::cout << std::endl;
}
#endif
#endif