From 781d863dd134626a2204232e91bf30c678e13ea9 Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Tue, 21 Jan 2025 16:26:17 -0800 Subject: [PATCH] Documentation: Fix malformed table Also fix an incorrect assertion due to code changes. Since we no longer support C++ < 17, we simply remove the assertion. --- Docs/sphinx_documentation/source/BuildingAMReX.rst | 4 ++-- Src/Base/AMReX_CTOParallelForImpl.H | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Docs/sphinx_documentation/source/BuildingAMReX.rst b/Docs/sphinx_documentation/source/BuildingAMReX.rst index 831346765b9..43afa7c337b 100644 --- a/Docs/sphinx_documentation/source/BuildingAMReX.rst +++ b/Docs/sphinx_documentation/source/BuildingAMReX.rst @@ -464,10 +464,10 @@ The list of available options is reported in the :ref:`table ` bel | AMReX_LINEAR_SOLVERS | Build AMReX linear solvers | YES | YES, NO | +------------------------------+-------------------------------------------------+-------------------------+-----------------------+ | AMReX_LINEAR_SOLVERS_INCFLO | Build AMReX linear solvers for incompressible | YES | YES, NO | - | | flow | | + | | flow | | | +------------------------------+-------------------------------------------------+-------------------------+-----------------------+ | AMReX_LINEAR_SOLVERS_EM | Build AMReX linear solvers for electromagnetic | YES | YES, NO | - | | solvers | | + | | solvers | | | +------------------------------+-------------------------------------------------+-------------------------+-----------------------+ | AMReX_AMRDATA | Build data services | NO | YES, NO | +------------------------------+-------------------------------------------------+-------------------------+-----------------------+ diff --git a/Src/Base/AMReX_CTOParallelForImpl.H b/Src/Base/AMReX_CTOParallelForImpl.H index d4431d7899b..24f39893a18 100644 --- a/Src/Base/AMReX_CTOParallelForImpl.H +++ b/Src/Base/AMReX_CTOParallelForImpl.H @@ -22,8 +22,6 @@ struct CompileTimeOptions { using list_type = TypeList...>; }; -#if (__cplusplus >= 201703L) - namespace detail { template @@ -76,8 +74,6 @@ namespace detail } } -#endif - /** * \brief Compile time optimization of kernels with run time options. * @@ -184,15 +180,10 @@ void AnyCTO ([[maybe_unused]] TypeList list_of_compile_time_options, std::array const& runtime_options, L&& l, Fs&&...cto_functs) { -#if (__cplusplus >= 201703L) detail::AnyCTO_helper1(std::forward(l), CartesianProduct(typename CTOs::list_type{}...), runtime_options, std::forward(cto_functs)...); -#else - amrex::ignore_unused(runtime_options, l, f); - static_assert(std::is_integral::value, "This requires C++17"); -#endif } template