more branch cleanup

nmm0 · Jul 3, 2024 · 85c848d · 85c848d
1 parent 31b166f
commit 85c848d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/core/src/Kokkos_Macros.hpp b/core/src/Kokkos_Macros.hpp
@@ -254,10 +254,6 @@
 #define KOKKOS_IMPL_ALIGN_PTR(size) __attribute__((aligned(size)))
 #endif
 
-#ifndef KOKKOS_IMPL_ASSUME_ALIGNED
-#define KOKKOS_IMPL_ASSUME_ALIGNED(element_type, pointer, byte_alignment) reinterpret_cast<element_type *>(__builtin_assume_aligned(pointer, byte_alignment))
-#endif
-
 #endif
 
 //----------------------------------------------------------------------------
@@ -282,10 +278,6 @@
      defined(__x86_64__) || defined(__PPC64__))
 #define KOKKOS_ENABLE_ASM 1
 #endif
-
-#ifndef KOKKOS_IMPL_ASSUME_ALIGNED
-#define KOKKOS_IMPL_ASSUME_ALIGNED(element_type, pointer, byte_alignment) reinterpret_cast<element_type *>(__builtin_assume_aligned(pointer, byte_alignment))
-#endif
 #endif
 
 //----------------------------------------------------------------------------
@@ -392,10 +384,6 @@
 #define KOKKOS_IMPL_ALIGN_PTR(size) /* */
 #endif
 
-#if !defined(KOKKOS_IMPL_ASSUME_ALIGNED)
-#define KOKKOS_IMPL_ASSUME_ALIGNED(element_type, pointer, byte_alignment) pointer
-#endif
-
 //----------------------------------------------------------------------------
 // Determine the default execution space for parallel dispatch.
 // There is zero or one default execution space specified.

diff --git a/core/src/Kokkos_View.hpp b/core/src/Kokkos_View.hpp
@@ -26,7 +26,6 @@ static_assert(false,
 #include <string>
 #include <algorithm>
 #include <initializer_list>
-#include <functional>
 
 #include <Kokkos_Core_fwd.hpp>
 #include <Kokkos_HostSpace.hpp>