Skip to content

SerialIOTest: Fix GCC Pragma Check #1260

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
ax3l merged 1 commit into from
Apr 29, 2022
Merged

SerialIOTest: Fix GCC Pragma Check #1260

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
11 changes: 6 additions & 5 deletions test/SerialIOTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,9 +417,11 @@ TEST_CASE("multiple_series_handles_test", "[serial]")
/*
* clang also understands these pragmas.
*/
#if defined(__GNUC__MINOR__) || defined(__clang__)
#if defined(__GNUC_MINOR__) && !defined(__INTEL_COMPILER)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#elif defined(__clang__)
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif
/*
* First test: No premature flushes through destructor when another copy
Expand Down Expand Up @@ -463,11 +465,10 @@ TEST_CASE("multiple_series_handles_test", "[serial]")
*/
series_ptr->flush();
}
#if defined(__INTEL_COMPILER)
#pragma warning(disable : 2282)
#endif
#if defined(__GNUC__MINOR__) || defined(__clang__)
#if defined(__GNUC_MINOR__) && !defined(__INTEL_COMPILER)
#pragma GCC diagnostic pop
#elif defined(__clang__)
#pragma clang diagnostic pop
#endif
}

Expand Down