kfr

commit 9a7a96dfb0faa65fdbadf517997880f25825474c
parent e6d7b12e3ad1aeca953ab548100740e1ab63550e
Author: [email protected] <[email protected]>
Date:   Mon, 18 Jul 2022 18:06:31 +0100

Remove inline specifier for KFR_FUNCTION

Diffstat:
M
include/kfr/base/expression.hpp
 | 
2
+-
M
include/kfr/cident.h
 | 
1
-
M
include/kfr/cometa.hpp
 | 
19
+++++--------------
M
include/kfr/dsp/units.hpp
 | 
2
+-
M
include/kfr/kfr.h
 | 
2
+-
M
include/kfr/runtime/cpuid_auto.hpp
 | 
2
+-

6 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/include/kfr/base/expression.hpp b/include/kfr/base/expression.hpp
@@ -425,7 +425,7 @@ CMT_INTRINSIC internal::expression_function<Fn, NewArgs...> rebind(
 
 template <size_t width = 0, typename OutputExpr, typename InputExpr, size_t groupsize = 1,
           typename Tvec = vec<value_type_of<InputExpr>, 1>>
-CMT_INTRINSIC static size_t process(OutputExpr&& out, const InputExpr& in, size_t start = 0,
+static size_t process(OutputExpr&& out, const InputExpr& in, size_t start = 0,
                                     size_t size = infinite_size, coutput_t coutput = nullptr,
                                     cinput_t cinput = nullptr, csize_t<groupsize> = csize_t<groupsize>())
 {
diff --git a/include/kfr/cident.h b/include/kfr/cident.h
@@ -380,7 +380,6 @@ extern char* gets(char* __s);
 
 #define CMT_INTRINSIC CMT_INLINE CMT_NODEBUG
 #define CMT_MEM_INTRINSIC CMT_INLINE CMT_NODEBUG
-#define CMT_FUNCTION inline
 
 #if defined _MSC_VER && _MSC_VER >= 1900 &&                                                                  \
     (!defined(__clang__) ||                                                                                  \
diff --git a/include/kfr/cometa.hpp b/include/kfr/cometa.hpp
@@ -268,16 +268,8 @@ struct compound_type_traits<std::pair<T, T>>
     }
 };
 
-namespace ops
-{
-struct empty
-{
-    constexpr empty() CMT_NOEXCEPT {}
-};
-} // namespace ops
-
 template <typename T, T val>
-struct cval_t : ops::empty
+struct cval_t
 {
     constexpr static T value = val;
     constexpr cval_t() CMT_NOEXCEPT {}
@@ -403,7 +395,7 @@ struct get_nth_type<index>
 } // namespace details
 
 template <typename T, T... values>
-struct cvals_t : ops::empty
+struct cvals_t
 {
     constexpr cvals_t() CMT_NOEXCEPT = default;
 
@@ -460,7 +452,7 @@ struct cvals_t : ops::empty
 };
 
 template <typename T>
-struct cvals_t<T> : ops::empty
+struct cvals_t<T>
 {
     using type = cvals_t<T>;
     constexpr static size_t size() { return 0; }
@@ -719,8 +711,7 @@ constexpr inline Ret cfilter(cvals_t<T, vals...>, cvals_t<bool, flags...>)
     {                                                                                                        \
         return Ret{};                                                                                        \
     }
-namespace ops
-{
+    
 // clang-format off
 CMT_UN_OP(-)
 CMT_UN_OP(+)
@@ -746,7 +737,7 @@ CMT_BIN_OP(&)
 CMT_BIN_OP(|)
 CMT_BIN_OP(^)
 // clang-format on
-} // namespace ops
+
 
 namespace details
 {
diff --git a/include/kfr/dsp/units.hpp b/include/kfr/dsp/units.hpp
@@ -162,7 +162,7 @@ KFR_FUNCTION flt_type<T1> amp_to_dB(const T1& x)
 }
 
 template <typename E1, KFR_ENABLE_IF(is_input_expression<E1>)>
-KFR_INTRINSIC internal::expression_function<fn::amp_to_dB, E1> amp_to_dB(E1&& x)
+KFR_FUNCTION internal::expression_function<fn::amp_to_dB, E1> amp_to_dB(E1&& x)
 {
     return { fn::amp_to_dB(), std::forward<E1>(x) };
 }
diff --git a/include/kfr/kfr.h b/include/kfr/kfr.h
@@ -72,7 +72,7 @@ constexpr inline const char version_full[] = KFR_VERSION_FULL;
 #ifdef KFR_FUNCTION_IS_INTRINSIC
 #define KFR_FUNCTION CMT_INTRINSIC
 #else
-#define KFR_FUNCTION CMT_FUNCTION
+#define KFR_FUNCTION 
 #endif
 #ifdef CMT_NATIVE_F64
 #define KFR_NATIVE_F64 CMT_NATIVE_F64
diff --git a/include/kfr/runtime/cpuid_auto.hpp b/include/kfr/runtime/cpuid_auto.hpp
@@ -57,6 +57,6 @@ static char dummyvar = init_dummyvar();
 /**
  * @brief Returns cpu instruction set detected at runtime.
  */
-KFR_FUNCTION cpu_t get_cpu() { return internal_generic::cpu_v(); }
+inline cpu_t get_cpu() { return internal_generic::cpu_v(); }
 
 } // namespace kfr