Don't force linear complexity and fix CI failure for old clang versions

boostorg · Feb 2, 2022 · dee1d44 · dee1d44
1 parent 6546e3a
commit dee1d44
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/reporting/performance/color_tables_performance.cpp b/reporting/performance/color_tables_performance.cpp
@@ -35,8 +35,8 @@ void color_table_benchmark(benchmark::State& state)
     state.SetComplexityN(state.range(0));
 }
 
-BENCHMARK_TEMPLATE(color_table_benchmark, float)->RangeMultiplier(2)->Range(1 << 6, 1 << 20)->Complexity(benchmark::oN)->UseRealTime();
-BENCHMARK_TEMPLATE(color_table_benchmark, double)->RangeMultiplier(2)->Range(1 << 6, 1 << 20)->Complexity(benchmark::oN)->UseRealTime();
-BENCHMARK_TEMPLATE(color_table_benchmark, long double)->RangeMultiplier(2)->Range(1 << 6, 1 << 20)->Complexity(benchmark::oN)->UseRealTime();
+BENCHMARK_TEMPLATE(color_table_benchmark, float)->RangeMultiplier(2)->Range(1 << 6, 1 << 20)->Complexity()->UseRealTime();
+BENCHMARK_TEMPLATE(color_table_benchmark, double)->RangeMultiplier(2)->Range(1 << 6, 1 << 20)->Complexity()->UseRealTime();
+BENCHMARK_TEMPLATE(color_table_benchmark, long double)->RangeMultiplier(2)->Range(1 << 6, 1 << 20)->Complexity()->UseRealTime();
 
 BENCHMARK_MAIN();
diff --git a/test/color_maps_test.cpp b/test/color_maps_test.cpp
@@ -24,6 +24,7 @@ void test()
     static_assert(user_plasma(0.5)[0] == plasma(0.5)[0]);
 }
 
+#if !defined(BOOST_MATH_NO_CONSTEXPR_DETECTION) && !defined(BOOST_MATH_USING_BUILTIN_CONSTANT_P)
 int main()
 {
     test<float>();
@@ -32,3 +33,9 @@ int main()
 
     return 0;
 }
+#else
+int main()
+{
+    return 0;
+}
+#endif