Fix const array init for clang

GuillaumeHolley · web-flow · commit b1a2fa60bb2f · 2023-10-10T13:54:08.000Z
diff --git a/src/BlockedBloomFilter.cpp b/src/BlockedBloomFilter.cpp
@@ -606,7 +606,7 @@ DualBlockedBloomFilter::DualBlockedBloomFilter(const size_t nb_elem, const size_
 }
 
 DualBlockedBloomFilter::DualBlockedBloomFilter(const DualBlockedBloomFilter& o) :   table_(nullptr), blocks_(o.blocks_), nb_bits_per_elem(o.nb_bits_per_elem),
-                                                                                    k_(o.k_), M_u64(o.M_u64), seed1(o.seed1), seed2(o.seed2), ush(o.ush) {
+                                                                                    k_(o.k_), M_u64(o.M_u64), seed1(o.seed1), seed2(o.seed2), ush{o.ush[0], o.ush[1]} {
 
     if (blocks_ != 0) {
 
@@ -622,10 +622,7 @@ DualBlockedBloomFilter::DualBlockedBloomFilter(const DualBlockedBloomFilter& o)
 }
 
 DualBlockedBloomFilter::DualBlockedBloomFilter(DualBlockedBloomFilter&& o) :    table_(o.table_), blocks_(o.blocks_), nb_bits_per_elem(o.nb_bits_per_elem),
-                                                                                k_(o.k_), M_u64(o.M_u64), seed1(o.seed1), seed2(o.seed2) {
-
-    ush[0] = move(o.ush[0]);
-    ush[1] = move(o.ush[1]);
+                                                                                k_(o.k_), M_u64(o.M_u64), seed1(o.seed1), seed2(o.seed2), ush{move(o.ush[0]), move(o.ush[1])} {
 
     o.table_ = nullptr;
 

Original file line number	Diff line number	Diff line change
`@@ -606,7 +606,7 @@ DualBlockedBloomFilter::DualBlockedBloomFilter(const size_t nb_elem, const size_`
`606`	`606`	`}`
`607`	`607`
`608`	`608`	`DualBlockedBloomFilter::DualBlockedBloomFilter(const DualBlockedBloomFilter& o) : table_(nullptr), blocks_(o.blocks_), nb_bits_per_elem(o.nb_bits_per_elem),`
`609`		`- k_(o.k_), M_u64(o.M_u64), seed1(o.seed1), seed2(o.seed2), ush(o.ush) {`
	`609`	`+ k_(o.k_), M_u64(o.M_u64), seed1(o.seed1), seed2(o.seed2), ush{o.ush[0], o.ush[1]} {`
`610`	`610`
`611`	`611`	`if (blocks_ != 0) {`
`612`	`612`
`@@ -622,10 +622,7 @@ DualBlockedBloomFilter::DualBlockedBloomFilter(const DualBlockedBloomFilter& o)`
`622`	`622`	`}`
`623`	`623`
`624`	`624`	`DualBlockedBloomFilter::DualBlockedBloomFilter(DualBlockedBloomFilter&& o) : table_(o.table_), blocks_(o.blocks_), nb_bits_per_elem(o.nb_bits_per_elem),`
`625`		`- k_(o.k_), M_u64(o.M_u64), seed1(o.seed1), seed2(o.seed2) {`
`626`		`-`
`627`		`- ush[0] = move(o.ush[0]);`
`628`		`- ush[1] = move(o.ush[1]);`
	`625`	`+ k_(o.k_), M_u64(o.M_u64), seed1(o.seed1), seed2(o.seed2), ush{move(o.ush[0]), move(o.ush[1])} {`
`629`	`626`
`630`	`627`	`o.table_ = nullptr;`
`631`	`628`