Skip to content

Commit 03e7e71

Browse files
committed
Initialize with nullptr
1 parent d6e3c8d commit 03e7e71

File tree

2 files changed

+39
-39
lines changed

2 files changed

+39
-39
lines changed

source/module_hsolver/diag_const_nums.cpp

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,70 +11,70 @@ template class const_nums<std::complex<float>>;
1111
template <>
1212
const_nums<double>::const_nums()
1313
{
14-
//base_device::memory::resize_memory_op<double, base_device::DEVICE_CPU>()(
15-
// this->cpu_ctx, this->zero, 1);
16-
this->zero = (double*)malloc(sizeof(double));
14+
base_device::memory::resize_memory_op<double, base_device::DEVICE_CPU>()(
15+
this->cpu_ctx, this->zero, 1);
16+
//this->zero = (double*)malloc(sizeof(double));
1717
this->zero[0] = 0.0;
18-
//base_device::memory::resize_memory_op<double, base_device::DEVICE_CPU>()(
19-
// this->cpu_ctx, this->one, 1);
20-
this->one = (double*)malloc(sizeof(double));
18+
base_device::memory::resize_memory_op<double, base_device::DEVICE_CPU>()(
19+
this->cpu_ctx, this->one, 1);
20+
//this->one = (double*)malloc(sizeof(double));
2121
this->one[0] = 1.0;
22-
//base_device::memory::resize_memory_op<double, base_device::DEVICE_CPU>()(
23-
// this->cpu_ctx, this->neg_one, 1);
24-
this->neg_one = (double*)malloc(sizeof(double));
22+
base_device::memory::resize_memory_op<double, base_device::DEVICE_CPU>()(
23+
this->cpu_ctx, this->neg_one, 1);
24+
//this->neg_one = (double*)malloc(sizeof(double));
2525
this->neg_one[0] = -1.0;
2626
}
2727

2828
// Specialize templates to support double types
2929
template <>
3030
const_nums<float>::const_nums()
3131
{
32-
//base_device::memory::resize_memory_op<float, base_device::DEVICE_CPU>()(
33-
// this->cpu_ctx, this->zero, 1);
34-
this->zero = (float*)malloc(sizeof(float));
32+
base_device::memory::resize_memory_op<float, base_device::DEVICE_CPU>()(
33+
this->cpu_ctx, this->zero, 1);
34+
//this->zero = (float*)malloc(sizeof(float));
3535
this->zero[0] = 0.0;
36-
//base_device::memory::resize_memory_op<float, base_device::DEVICE_CPU>()(
37-
// this->cpu_ctx, this->one, 1);
38-
this->one = (float*)malloc(sizeof(float));
36+
base_device::memory::resize_memory_op<float, base_device::DEVICE_CPU>()(
37+
this->cpu_ctx, this->one, 1);
38+
//this->one = (float*)malloc(sizeof(float));
3939
this->one[0] = 1.0;
40-
//base_device::memory::resize_memory_op<float, base_device::DEVICE_CPU>()(
41-
// this->cpu_ctx, this->neg_one, 1);
42-
this->neg_one = (float*)malloc(sizeof(float));
40+
base_device::memory::resize_memory_op<float, base_device::DEVICE_CPU>()(
41+
this->cpu_ctx, this->neg_one, 1);
42+
//this->neg_one = (float*)malloc(sizeof(float));
4343
this->neg_one[0] = -1.0;
4444
}
4545

4646
// Specialized templates to support std:: complex<double>types
4747
template <>
4848
const_nums<std::complex<double>>::const_nums()
4949
{
50-
//base_device::memory::resize_memory_op<std::complex<double>, base_device::DEVICE_CPU>()(
51-
// this->cpu_ctx, this->zero, 1);
52-
this->zero = (std::complex<double>*)malloc(sizeof(std::complex<double>));
50+
base_device::memory::resize_memory_op<std::complex<double>, base_device::DEVICE_CPU>()(
51+
this->cpu_ctx, this->zero, 1);
52+
//this->zero = (std::complex<double>*)malloc(sizeof(std::complex<double>));
5353
this->zero[0] = std::complex<double>(0.0, 0.0);
54-
//base_device::memory::resize_memory_op<std::complex<double>, base_device::DEVICE_CPU>()(
55-
// this->cpu_ctx, this->one, 1);
56-
this->one = (std::complex<double>*)malloc(sizeof(std::complex<double>));
54+
base_device::memory::resize_memory_op<std::complex<double>, base_device::DEVICE_CPU>()(
55+
this->cpu_ctx, this->one, 1);
56+
//this->one = (std::complex<double>*)malloc(sizeof(std::complex<double>));
5757
this->one[0] = std::complex<double>(1.0, 0.0);
58-
//base_device::memory::resize_memory_op<std::complex<double>, base_device::DEVICE_CPU>()(
59-
// this->cpu_ctx, this->neg_one, 1);
60-
this->neg_one = (std::complex<double>*)malloc(sizeof(std::complex<double>));
58+
base_device::memory::resize_memory_op<std::complex<double>, base_device::DEVICE_CPU>()(
59+
this->cpu_ctx, this->neg_one, 1);
60+
//this->neg_one = (std::complex<double>*)malloc(sizeof(std::complex<double>));
6161
this->neg_one[0] = std::complex<double>(-1.0, 0.0);
6262
}
6363

6464
// Specialized templates to support std:: complex<float>types
6565
template <>
6666
const_nums<std::complex<float>>::const_nums()
6767
{
68-
//base_device::memory::resize_memory_op<std::complex<float>, base_device::DEVICE_CPU>()(
69-
// this->cpu_ctx, this->zero, 1);
70-
this->zero = (std::complex<float>*)malloc(sizeof(std::complex<float>));
68+
base_device::memory::resize_memory_op<std::complex<float>, base_device::DEVICE_CPU>()(
69+
this->cpu_ctx, this->zero, 1);
70+
//this->zero = (std::complex<float>*)malloc(sizeof(std::complex<float>));
7171
this->zero[0] = std::complex<float>(0.0, 0.0);
72-
//base_device::memory::resize_memory_op<std::complex<float>, base_device::DEVICE_CPU>()(
73-
// this->cpu_ctx, this->one, 1);
74-
this->one = (std::complex<float>*)malloc(sizeof(std::complex<float>));
72+
base_device::memory::resize_memory_op<std::complex<float>, base_device::DEVICE_CPU>()(
73+
this->cpu_ctx, this->one, 1);
74+
//this->one = (std::complex<float>*)malloc(sizeof(std::complex<float>));
7575
this->one[0] = std::complex<float>(1.0, 0.0);
76-
//base_device::memory::resize_memory_op<std::complex<float>, base_device::DEVICE_CPU>()(
77-
// this->cpu_ctx, this->neg_one, 1);
78-
this->neg_one = (std::complex<float>*)malloc(sizeof(std::complex<float>));
76+
base_device::memory::resize_memory_op<std::complex<float>, base_device::DEVICE_CPU>()(
77+
this->cpu_ctx, this->neg_one, 1);
78+
//this->neg_one = (std::complex<float>*)malloc(sizeof(std::complex<float>));
7979
this->neg_one[0] = std::complex<float>(-1.0, 0.0);
8080
}

source/module_hsolver/diag_const_nums.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ struct const_nums
77
{
88
const_nums();
99
base_device::DEVICE_CPU* cpu_ctx = {};
10-
T* zero;
11-
T* one;
12-
T* neg_one;
10+
T* zero = nullptr;
11+
T* one = nullptr;
12+
T* neg_one = nullptr;
1313
};
1414

1515
#endif

0 commit comments

Comments
 (0)