atria-soft/etk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] remove dead code

Browse Source
This commit is contained in:
Edouard DUPIN 2017-10-14 11:15:08 +02:00
parent aed8af17de
commit 4a62e68b09
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
etk/Vector.hpp
View File

@ -8,22 +8,11 @@
#include <etk/types.hpp>
//#include <etk/debug.hpp>
#include <etk/Stream.hpp>
#include <etk/Allocator.hpp>
//#define ETK_VECTOR_DEBUG(...) printf(__VA_ARGS__)
#define ETK_VECTOR_DEBUG(...) do {} while (false)
// it is define bu generic "include <new>" ==> no double define of placement new
#ifndef _NEW
// Default placement versions of operator new.
inline void* operator new(size_t, char* _p) throw() {
ETK_VECTOR_DEBUG("plop\n");
return _p;
}
inline void operator delete (void*, char*) throw() {
}
#endif
namespace etk {
class Stream;
/**
@ -252,7 +241,7 @@ namespace etk {
changeAllocation(_count);
// instanciate all objects
for (size_t iii=0; iii<_count; ++iii) {
new ((char*)&m_data[iii]) ETK_VECTOR_TYPE();
new ((char*)&m_data[iii]) ETK_VECTOR_TYPE();
}
m_size = _count;
}
@ -279,11 +268,7 @@ namespace etk {
m_allocated(0) {
reserve(_obj.m_size);
for(size_t iii=0; iii<_obj.m_size; iii++) {
#if 0
pushBack(_obj.m_data[iii]);
#else
new ((char*)&m_data[iii]) ETK_VECTOR_TYPE(etk::move(_obj.m_data[iii]));
#endif
new ((char*)&m_data[iii]) ETK_VECTOR_TYPE(etk::move(_obj.m_data[iii]));
}
m_size = _obj.m_size;
}
@ -357,11 +342,7 @@ namespace etk {
// Force a specicfic size
reserve(_obj.m_size);
for(size_t iii=0; iii<_obj.m_size; iii++) {
#if 0
pushBack(_obj.m_data[iii]);
#else
new ((char*)&m_data[iii]) ETK_VECTOR_TYPE(etk::move(_obj.m_data[iii]));
#endif
new ((char*)&m_data[iii]) ETK_VECTOR_TYPE(etk::move(_obj.m_data[iii]));
}
m_size = _obj.m_size;
// Return the current pointer