Squashed 'include/alpaka/' changes from 1461e64..955fa97

955fa97 fix include that is only required if OpenMP is included 395abe2 fix missing header 40bb1c0 allow zero sized allocations git-subtree-dir: include/alpaka git-subtree-split: 955fa9794e8bad10cdcf7c708f2e1a0abb5d4e27
erikzenker · Sep 2, 2015 · 884eb56 · 884eb56
1 parent 23842e6
commit 884eb56
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/include/alpaka/alpaka.hpp b/include/alpaka/alpaka.hpp
@@ -84,7 +84,9 @@
     #include <alpaka/atomic/AtomicCudaBuiltIn.hpp>
 #endif
 #include <alpaka/atomic/AtomicNoOp.hpp>
-#include <alpaka/atomic/AtomicOmpCritSec.hpp>
+#ifdef _OPENMP
+    #include <alpaka/atomic/AtomicOmpCritSec.hpp>
+#endif
 #include <alpaka/atomic/AtomicStlLock.hpp>
 #include <alpaka/atomic/Op.hpp>
 #include <alpaka/atomic/Traits.hpp>

diff --git a/include/alpaka/extent/Traits.hpp b/include/alpaka/extent/Traits.hpp
@@ -24,6 +24,7 @@
 #include <alpaka/core/IntegerSequence.hpp>  // integer_sequence
 #include <alpaka/core/Common.hpp>           // ALPAKA_FN_HOST_ACC
 #include <alpaka/core/Fold.hpp>             // core::foldr
+#include <alpaka/size/Traits.hpp>           // size::Size
 
 #if !defined(__CUDA_ARCH__)
     #include <boost/core/ignore_unused.hpp> // boost::ignore_unused

diff --git a/include/alpaka/mem/alloc/AllocCpuBoostAligned.hpp b/include/alpaka/mem/alloc/AllocCpuBoostAligned.hpp
@@ -69,7 +69,6 @@ namespace alpaka
                         std::size_t const & sizeElems)
                     -> T *
                     {
-                        assert(sizeElems>0);
                         boost::ignore_unused(alloc);
                         return
                             reinterpret_cast<T *>(

diff --git a/include/alpaka/mem/alloc/AllocCpuNew.hpp b/include/alpaka/mem/alloc/AllocCpuNew.hpp
@@ -62,7 +62,6 @@ namespace alpaka
                         std::size_t const & sizeElems)
                     -> T *
                     {
-                        assert(sizeElems>0);
                         boost::ignore_unused(alloc);
                         return new T[sizeElems];
                     }