Revert if constepr macro

free-audio · Jan 19, 2024 · e61cad1 · e61cad1
1 parent aa26d48
commit e61cad1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/include/clap/helpers/host.hxx b/include/clap/helpers/host.hxx
@@ -428,15 +428,15 @@ namespace clap { namespace helpers {
    ///////////////
    template <MisbehaviourHandler h, CheckingLevel l>
    Host<h, l> &Host<h, l>::from(const clap_host *host) noexcept {
-      CLAP_IF_CONSTEXPR (l >= CheckingLevel::Minimal) {
+      if constexpr (l >= CheckingLevel::Minimal) {
          if (!host) CLAP_HELPERS_UNLIKELY {
             std::cerr << "Passed an null host pointer" << std::endl;
             std::terminate();
          }
       }
 
       auto self = static_cast<Host *>(host->host_data);
-      CLAP_IF_CONSTEXPR (l >= CheckingLevel::Minimal) {
+      if constexpr (l >= CheckingLevel::Minimal) {
          if (!self) CLAP_HELPERS_UNLIKELY {
             std::cerr << "Passed an invalid host pointer because the host_data is null"
                       << std::endl;

diff --git a/include/clap/helpers/macros.hh b/include/clap/helpers/macros.hh
@@ -1,11 +1,5 @@
 #pragma once
 
-#if defined(__cplusplus) && __cplusplus >= 201703L
-#   define CLAP_IF_CONSTEXPR if constexpr
-#else
-#   define CLAP_IF_CONSTEXPR if
-#endif
-
 #if defined(__cplusplus) && __cplusplus >= 202002L
 #   define CLAP_HELPERS_UNLIKELY [[unlikely]]
 #else