Replace assert with DK_ASSERT.

This commit is contained in:
Michele Santullo 2015-08-14 12:30:27 +02:00
parent cab7c296f1
commit 8f77af0ac1
5 changed files with 4 additions and 7 deletions

View file

@ -4,7 +4,6 @@
#include "doorkeeper/primitivetypes.hpp" #include "doorkeeper/primitivetypes.hpp"
#include "doorkeeper/implem/vector.hpp" #include "doorkeeper/implem/vector.hpp"
#include <cstdint> #include <cstdint>
#include <cassert>
namespace dk { namespace dk {
template <uint32_t D> template <uint32_t D>

View file

@ -8,7 +8,6 @@
#include <vector> #include <vector>
#include <type_traits> #include <type_traits>
#include <cstdint> #include <cstdint>
#include <cassert>
namespace dk { namespace dk {
template <typename T, uint32_t D, typename T1> template <typename T, uint32_t D, typename T1>

View file

@ -4,7 +4,6 @@
#include "doorkeeper/components/layer.hpp" #include "doorkeeper/components/layer.hpp"
#include "doorkeeper/components/exception.hpp" #include "doorkeeper/components/exception.hpp"
#include <vector> #include <vector>
#include <cassert>
#include <ciso646> #include <ciso646>
#include <memory> #include <memory>
#include <cstdint> #include <cstdint>

View file

@ -4,7 +4,7 @@ namespace dk {
m_pos(CoordinateScalarType(0)), m_pos(CoordinateScalarType(0)),
m_size(parSize) m_size(parSize)
{ {
assert(m_pos <= m_size); DK_ASSERT(m_pos <= m_size);
} }
template <uint32_t D> template <uint32_t D>
@ -12,7 +12,7 @@ namespace dk {
m_pos(parValue), m_pos(parValue),
m_size(parSize) m_size(parSize)
{ {
assert(m_pos <= m_size); DK_ASSERT(m_pos <= m_size);
} }
template <uint32_t D> template <uint32_t D>

View file

@ -143,8 +143,8 @@ namespace dk {
template <typename T, uint32_t D, typename T1> template <typename T, uint32_t D, typename T1>
T& TileIterator<T, D, T1>::dereference() const { T& TileIterator<T, D, T1>::dereference() const {
const auto index = this->get_current_index(); const auto index = this->get_current_index();
assert(m_data); DK_ASSERT(m_data);
assert(index < m_data->size()); DK_ASSERT(index < m_data->size());
return (*m_data)[index]; return (*m_data)[index];
} }
} //namespace dk } //namespace dk