OctaForge
/
libostd
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

use nullptr

master
Daniel Kolesa 2015-04-15 22:41:32 +01:00
parent e2f43ed25e
commit e12b221112
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octa/utility.h
View File

@ -27,7 +27,7 @@ namespace std {
typedef ptrdiff_t difference; typedef ptrdiff_t difference;
}; };
initializer_list(): p_buf(NULL), p_len(0) {} initializer_list(): p_buf(nullptr), p_len(0) {}
size_t length() const { return p_len; } size_t length() const { return p_len; }

8
octa/vector.h
View File

@ -32,7 +32,7 @@ namespace octa {
typedef ptrdiff_t difference; typedef ptrdiff_t difference;
}; };
explicit Vector(): p_buf(NULL), p_len(0), p_cap(0) {} explicit Vector(): p_buf(nullptr), p_len(0), p_cap(0) {}
explicit Vector(size_t n, const T &val = T()): Vector() { explicit Vector(size_t n, const T &val = T()): Vector() {
p_buf = new uchar[n * sizeof(T)]; p_buf = new uchar[n * sizeof(T)];
@ -46,7 +46,7 @@ namespace octa {
} }
Vector(Vector &&v): p_buf(v.p_buf), p_len(v.p_len), p_cap(v.p_cap) { Vector(Vector &&v): p_buf(v.p_buf), p_len(v.p_len), p_cap(v.p_cap) {
v.p_buf = NULL; v.p_buf = nullptr;
v.p_len = v.p_cap = 0; v.p_len = v.p_cap = 0;
} }
@ -65,7 +65,7 @@ namespace octa {
while (cur != last) (*cur++).~T(); while (cur != last) (*cur++).~T();
} }
delete[] (uchar *)p_buf; delete[] (uchar *)p_buf;
p_buf = NULL; p_buf = nullptr;
p_len = p_cap = 0; p_len = p_cap = 0;
} }
} }
@ -202,7 +202,7 @@ namespace octa {
T *disown() { T *disown() {
T *r = p_buf; T *r = p_buf;
p_buf = NULL; p_buf = nullptr;
p_len = p_cap = 0; p_len = p_cap = 0;
return r; return r;
} }