steven/TinySTL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code clean

Browse Source
This commit is contained in:
邹晓航
2015-02-15 12:14:07 +08:00
parent 9a13d7acc9
commit 88f30dbb55
3 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
TinySTL/Detail/AVLTree.impl.h
View File

@@ -154,8 +154,8 @@ namespace TinySTL{
void avl_tree<T>::insert_elem(const T& val, node *&p){ void avl_tree<T>::insert_elem(const T& val, node *&p){
if (p == 0){ if (p == 0){
p = dataAllocator::allocate(); p = dataAllocator::allocate();
//p->data_ = val; dataAllocator::construct(p);
construct(&(p->data_), val); p->data_ = val;
p->left_ = p->right_ = 0; p->left_ = p->right_ = 0;
p->height_ = 1; p->height_ = 1;
++size_; ++size_;

5
TinySTL/Detail/BinarySearchTree.impl.h
View File

@@ -137,9 +137,8 @@ namespace TinySTL{
void binary_search_tree<T>::insert_elem(const T& val, node *&ptr){//<2F>ظ<EFBFBD><D8B8><EFBFBD>Ԫ<EFBFBD>ز<EFBFBD><D8B2><EFBFBD><EFBFBD><EFBFBD> void binary_search_tree<T>::insert_elem(const T& val, node *&ptr){//<2F>ظ<EFBFBD><D8B8><EFBFBD>Ԫ<EFBFBD>ز<EFBFBD><D8B2><EFBFBD><EFBFBD><EFBFBD>
if (ptr == 0){ if (ptr == 0){
ptr = nodeAllocator::allocate(); ptr = nodeAllocator::allocate();
TinySTL::construct(&(ptr->data_), val); nodeAllocator::construct(ptr);
//memset(ptr, 0, sizeof(node)); ptr->data_ = val;
//ptr->data_ = val;
ptr->left_ = ptr->right_ = 0; ptr->left_ = ptr->right_ = 0;
++size_; ++size_;
} }

15
TinySTL/Detail/List.impl.h
View File

@@ -44,10 +44,6 @@ namespace TinySTL{
template<class T> template<class T>
template<class InputIterator> template<class InputIterator>
void list<T>::insert_aux(iterator position, InputIterator first, InputIterator last, std::false_type){ void list<T>::insert_aux(iterator position, InputIterator first, InputIterator last, std::false_type){
//for (; first != last; ++first){
// insert(position, *first);
// position = insert(position, *first);
//}
for (--last; first != last; --last){ for (--last; first != last; --last){
position = insert(position, *last); position = insert(position, *last);
} }
@@ -56,18 +52,13 @@ namespace TinySTL{
template<class T> template<class T>
typename list<T>::nodePtr list<T>::newNode(const T& val = T()){ typename list<T>::nodePtr list<T>::newNode(const T& val = T()){
nodePtr res = nodeAllocator::allocate(); nodePtr res = nodeAllocator::allocate();
res->container = this; nodeAllocator::construct(res, Detail::node<T>(val, nullptr, nullptr, this));
//res->data = val; //-> bug
//nodeAllocator::construct(&(res->data), val);
TinySTL::construct(&(res->data), val);//fix
res->prev = nullptr;
res->next = nullptr;
return res; return res;
} }
template<class T> template<class T>
void list<T>::deleteNode(nodePtr p){ void list<T>::deleteNode(nodePtr p){
p->prev = nullptr; p->prev = p->next = nullptr;
p->next = nullptr; nodeAllocator::destroy(p);
nodeAllocator::deallocate(p); nodeAllocator::deallocate(p);
} }
template<class T> template<class T>