Add missing includes / forward declaration

Author: serge-sans-paille

include/xsimd/arch/generic/xsimd_generic_math.hpp

@@ -12,12 +12,12 @@
 #ifndef XSIMD_GENERIC_MATH_HPP
 #define XSIMD_GENERIC_MATH_HPP
 
-#include <type_traits>
-
 #include "../xsimd_scalar.hpp"
 #include "./xsimd_generic_details.hpp"
 #include "./xsimd_generic_trigo.hpp"
 
+#include <type_traits>
+
 namespace xsimd
 {
 

include/xsimd/arch/xsimd_neon.hpp

@@ -86,6 +86,9 @@ inline float32x4_t vreinterpretq_f32_f32(float32x4_t arg) { return arg; }
 
 namespace xsimd
 {
+    template <class batch_type, bool... Values>
+    struct batch_bool_constant;
+
     namespace kernel
     {
         using namespace types;

include/xsimd/arch/xsimd_neon64.hpp

@@ -21,6 +21,9 @@
 
 namespace xsimd
 {
+    template <class batch_type, bool... Values>
+    struct batch_bool_constant;
+
     namespace kernel
     {
         using namespace types;

include/xsimd/arch/xsimd_scalar.hpp

@@ -17,8 +17,16 @@
 #include <limits>
 #include <type_traits>
 
+#ifdef XSIMD_ENABLE_XTL_COMPLEX
+#include "xtl/xcomplex.hpp"
+#endif
+
 namespace xsimd
 {
+    template <class T, class A>
+    class batch;
+    template <class T, class A>
+    class batch_bool;
 
     using std::abs;
 

include/xsimd/arch/xsimd_sse2.hpp

@@ -20,6 +20,8 @@
 
 namespace xsimd
 {
+    template <class batch_type, bool... Values>
+    struct batch_bool_constant;
 
     namespace kernel
     {

include/xsimd/arch/xsimd_ssse3.hpp

@@ -16,6 +16,7 @@
 #include <type_traits>
 
 #include "../types/xsimd_ssse3_register.hpp"
+#include "../types/xsimd_utils.hpp"
 
 namespace xsimd
 {

include/xsimd/types/xsimd_avx512cd_register.hpp

@@ -12,7 +12,7 @@
 #ifndef XSIMD_AVX512CD_REGISTER_HPP
 #define XSIMD_AVX512CD_REGISTER_HPP
 
-#include "./xsimd_avx512cd_register.hpp"
+#include "./xsimd_avx512f_register.hpp"
 
 namespace xsimd
 {
@@ -24,7 +24,7 @@ namespace xsimd
      */
     struct avx512cd : avx512f
     {
-        static constexpr bool supported() { return XSIMD_WITH_AVX512BW; }
+        static constexpr bool supported() { return XSIMD_WITH_AVX512CD; }
         static constexpr bool available() { return true; }
         static constexpr unsigned version() { return generic::version(3, 2, 0); }
         static constexpr char const* name() { return "avx512cd"; }

include/xsimd/types/xsimd_batch.hpp

@@ -373,45 +373,6 @@ namespace xsimd
     template <class T, class A>
     constexpr std::size_t batch<std::complex<T>, A>::size;
 
-    /*******************
-     * real_batch_type *
-     *******************/
-
-    template <class B>
-    struct real_batch_type
-    {
-        using type = B;
-    };
-
-    template <class T, class A>
-    struct real_batch_type<batch<std::complex<T>, A>>
-    {
-        using type = batch<T, A>;
-    };
-
-    template <class B>
-    using real_batch_type_t = typename real_batch_type<B>::type;
-
-    /**********************
-     * complex_batch_type *
-     **********************/
-
-    template <class B>
-    struct complex_batch_type
-    {
-        using real_value_type = typename B::value_type;
-        using arch_type = typename B::arch_type;
-        using type = batch<std::complex<real_value_type>, arch_type>;
-    };
-
-    template <class T, class A>
-    struct complex_batch_type<batch<std::complex<T>, A>>
-    {
-        using type = batch<std::complex<T>, A>;
-    };
-
-    template <class B>
-    using complex_batch_type_t = typename complex_batch_type<B>::type;
 }
 
 #include "../arch/xsimd_isa.hpp"

include/xsimd/types/xsimd_generic_arch.hpp

@@ -12,6 +12,8 @@
 #ifndef XSIMD_GENERIC_ARCH_HPP
 #define XSIMD_GENERIC_ARCH_HPP
 
+#include "../config/xsimd_config.hpp"
+
 /**
  * @defgroup arch
  * */

include/xsimd/types/xsimd_utils.hpp

@@ -425,6 +425,46 @@ namespace xsimd
         };
 #endif
     }
+
+    /*******************
+     * real_batch_type *
+     *******************/
+
+    template <class B>
+    struct real_batch_type
+    {
+        using type = B;
+    };
+
+    template <class T, class A>
+    struct real_batch_type<batch<std::complex<T>, A>>
+    {
+        using type = batch<T, A>;
+    };
+
+    template <class B>
+    using real_batch_type_t = typename real_batch_type<B>::type;
+
+    /**********************
+     * complex_batch_type *
+     **********************/
+
+    template <class B>
+    struct complex_batch_type
+    {
+        using real_value_type = typename B::value_type;
+        using arch_type = typename B::arch_type;
+        using type = batch<std::complex<real_value_type>, arch_type>;
+    };
+
+    template <class T, class A>
+    struct complex_batch_type<batch<std::complex<T>, A>>
+    {
+        using type = batch<std::complex<T>, A>;
+    };
+
+    template <class B>
+    using complex_batch_type_t = typename complex_batch_type<B>::type;
 }
 
 #endif

include/xsimd/xsimd.hpp

@@ -20,8 +20,10 @@
 
 #include "arch/xsimd_scalar.hpp"
 #include "memory/xsimd_aligned_allocator.hpp"
-#include "types/xsimd_api.hpp"
 #include "types/xsimd_batch.hpp"
 #include "types/xsimd_batch_constant.hpp"
 #include "types/xsimd_traits.hpp"
+
+// This include must come last
+#include "types/xsimd_api.hpp"
 #endif