Skip to content

Commit

Permalink
Merge pull request #6653 from masterleinad/remove_deprecation_allocat…
Browse files Browse the repository at this point in the history
…ion_mechanism_gcc_11_0

Remove deprecation warning for AllocationMechanism for gcc <11.0
  • Loading branch information
dalg24 authored and masterleinad committed Dec 7, 2023
1 parent 71a9bca commit 232114f
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions core/src/Kokkos_HostSpace.hpp
Expand Up @@ -75,12 +75,19 @@ class HostSpace {
/**\brief Non-default memory space instance to choose allocation mechansim,
* if available */

enum KOKKOS_DEPRECATED AllocationMechanism {
STD_MALLOC,
POSIX_MEMALIGN,
POSIX_MMAP,
INTEL_MM_ALLOC
};
#if defined(KOKKOS_COMPILER_GNU) && KOKKOS_COMPILER_GNU < 1100
// We see deprecation warnings even when not using the deprecated
// HostSpace constructor below when using gcc before release 11.
enum
#else
enum KOKKOS_DEPRECATED
#endif
AllocationMechanism {
STD_MALLOC,
POSIX_MEMALIGN,
POSIX_MMAP,
INTEL_MM_ALLOC
};

KOKKOS_DEPRECATED
explicit HostSpace(const AllocationMechanism&);
Expand Down

0 comments on commit 232114f

Please sign in to comment.