Skip to content

Commit

Permalink
Merge pull request #798 from ax3l/fix-TotalDivJupdate
Browse files Browse the repository at this point in the history
Fix #94 CartBuffer Warning
  • Loading branch information
psychocoderHPC committed Apr 8, 2015
2 parents 7905fa9 + 934bd1e commit 85baf8a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/libPMacc/include/cuSTL/container/CartBuffer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class CartBuffer
math::Size_t<T_dim-1> pitch;
HDINLINE void init();
HDINLINE void exit();
HDINLINE CartBuffer() {}
HDINLINE CartBuffer() : refCount(NULL) {}
private:
/* makes this class able to emulate a r-value reference */
BOOST_COPYABLE_AND_MOVABLE(This)
Expand Down
12 changes: 6 additions & 6 deletions src/libPMacc/include/cuSTL/container/CartBuffer.tpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,36 +82,36 @@ namespace detail

template<typename Type, int T_dim, typename Allocator, typename Copier, typename Assigner>
CartBuffer<Type, T_dim, Allocator, Copier, Assigner>::CartBuffer
(const math::Size_t<T_dim>& _size)
(const math::Size_t<T_dim>& _size) : refCount(NULL)
{
this->_size = _size;
init();
}

template<typename Type, int T_dim, typename Allocator, typename Copier, typename Assigner>
CartBuffer<Type, T_dim, Allocator, Copier, Assigner>::CartBuffer
(size_t x)
(size_t x) : refCount(NULL)
{
this->_size = math::Size_t<1>(x); init();
}

template<typename Type, int T_dim, typename Allocator, typename Copier, typename Assigner>
CartBuffer<Type, T_dim, Allocator, Copier, Assigner>::CartBuffer
(size_t x, size_t y)
(size_t x, size_t y) : refCount(NULL)
{
this->_size = math::Size_t<2>(x, y); init();
}

template<typename Type, int T_dim, typename Allocator, typename Copier, typename Assigner>
CartBuffer<Type, T_dim, Allocator, Copier, Assigner>::CartBuffer
(size_t x, size_t y, size_t z)
(size_t x, size_t y, size_t z) : refCount(NULL)
{
this->_size = math::Size_t<3>(x, y, z); init();
}

template<typename Type, int T_dim, typename Allocator, typename Copier, typename Assigner>
CartBuffer<Type, T_dim, Allocator, Copier, Assigner>::CartBuffer
(const CartBuffer<Type, T_dim, Allocator, Copier, Assigner>& other)
(const CartBuffer<Type, T_dim, Allocator, Copier, Assigner>& other) : refCount(NULL)
{
this->dataPointer = other.dataPointer;
this->refCount = other.refCount;
Expand All @@ -124,7 +124,7 @@ CartBuffer<Type, T_dim, Allocator, Copier, Assigner>::CartBuffer

template<typename Type, int T_dim, typename Allocator, typename Copier, typename Assigner>
CartBuffer<Type, T_dim, Allocator, Copier, Assigner>::CartBuffer
(BOOST_RV_REF(CartBuffer<Type COMMA T_dim COMMA Allocator COMMA Copier COMMA Assigner>) other)
(BOOST_RV_REF(CartBuffer<Type COMMA T_dim COMMA Allocator COMMA Copier COMMA Assigner>) other) : refCount(NULL)
{
this->dataPointer = 0;
this->refCount = 0;
Expand Down

0 comments on commit 85baf8a

Please sign in to comment.