Skip to content

Commit d39ffcd

Browse files
authored
Merge d5d6af8 into sapling-pr-archive-ktf
2 parents 1ab4118 + d5d6af8 commit d39ffcd

File tree

4 files changed

+0
-13
lines changed

4 files changed

+0
-13
lines changed

Framework/Core/src/ArrowSupport.cxx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747
#include <boost/program_options/variables_map.hpp>
4848
#include <csignal>
4949

50-
#pragma GCC diagnostic push
51-
#pragma GCC diagnostic ignored "-Wpedantic"
5250
namespace o2::framework
5351
{
5452

@@ -597,4 +595,3 @@ o2::framework::ServiceSpec ArrowSupport::arrowTableSlicingCacheSpec()
597595
}
598596

599597
} // namespace o2::framework
600-
#pragma GGC diagnostic pop

Framework/Core/src/CommonServices.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1323,4 +1323,3 @@ std::vector<ServiceSpec> CommonServices::arrowServices()
13231323
}
13241324

13251325
} // namespace o2::framework
1326-
#pragma GCC diagnostic pop

Framework/Core/test/test_ComputingQuotaEvaluator.cxx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
#include "Framework/ServiceRegistryHelpers.h"
2020
#include "uv.h"
2121

22-
#pragma GCC diagnostic push
23-
#pragma GCC diagnostic ignored "-Wpedantic"
2422
using namespace o2::framework;
2523

2624
TEST_CASE("TestComputingQuotaEvaluator")
@@ -219,5 +217,3 @@ TEST_CASE("TestComputingQuotaEvaluator")
219217
REQUIRE(evaluator.mOffers[1].valid == false);
220218
REQUIRE(evaluator.mOffers[2].valid == false);
221219
}
222-
223-
#pragma GGC diagnostic pop

Framework/Core/test/test_DataProcessorSpec.cxx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
#include "Framework/DataProcessorSpecHelpers.h"
1515
#include "Framework/ConfigParamSpec.h"
1616

17-
#pragma GCC diagnostic push
18-
#pragma GCC diagnostic ignored "-Wpedantic"
19-
2017
TEST_CASE("TestDataProcessorSpecHelpers")
2118
{
2219
using namespace o2::framework;
@@ -35,5 +32,3 @@ TEST_CASE("TestDataProcessorSpecHelpers")
3532
REQUIRE(DataProcessorSpecHelpers::hasLabel(spec, "label2") == false);
3633
REQUIRE(DataProcessorSpecHelpers::hasLabel(spec, "label3") == true);
3734
}
38-
39-
#pragma diagnostic pop

0 commit comments

Comments
 (0)