Commit 4f59f50 1 parent 719c1a1 commit 4f59f50 Copy full SHA for 4f59f50
File tree 1 file changed +7
-7
lines changed
1 file changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -19,20 +19,20 @@ template <class T> class ptr_vector : protected std::vector<T *> {
19
19
template <
20
20
typename T1,
21
21
std::enable_if_t <std::is_array<T1>::value, bool > = true >
22
- inline static void destroyE (T1 *e) {
22
+ inline static void delete0 (T1 *e) {
23
23
delete[] e;
24
24
}
25
25
26
26
template <
27
27
typename T1,
28
- std::enable_if_t <std::is_array<T1>::value, bool > = false >
29
- inline static void destroyE (T1 *e) {
28
+ std::enable_if_t <! std::is_array<T1>::value, bool > = true >
29
+ inline static void delete0 (T1 *e) {
30
30
delete e;
31
31
}
32
32
33
- inline static void deleteEl (T *e) {
33
+ inline static void delete1 (T *e) {
34
34
if (e)
35
- destroyE<T> (e);
35
+ delete0 (e);
36
36
}
37
37
38
38
public:
@@ -43,7 +43,7 @@ template <class T> class ptr_vector : protected std::vector<T *> {
43
43
44
44
~ptr_vector () {
45
45
for (auto &e : (*this ))
46
- deleteEl (e);
46
+ delete1 (e);
47
47
}
48
48
49
49
T *&operator [](unsigned pos) { return at (pos); }
@@ -61,7 +61,7 @@ template <class T> class ptr_vector : protected std::vector<T *> {
61
61
void resize (unsigned new_size) {
62
62
unsigned oldsize = size ();
63
63
for (unsigned i = new_size; i < oldsize; i++)
64
- deleteEl (at (i));
64
+ delete1 (at (i));
65
65
std::vector<T *>::resize (new_size);
66
66
for (unsigned i = oldsize; i < new_size; i++)
67
67
at (i) = nullptr ;
You can’t perform that action at this time.
0 commit comments