warnings: Compiler warning on memset usage for non-trivial type
Problem: - IS_TRIVIALLY_CONSTRUCTIBLE macro does not work correctly resulting in `memset()` usage to set a non-trivial type to 0 when `nontrivial_t` is passed in from the tests. - Warning reported by GCC when compiling with `--enable-werror`. Solution: - Use the standard algorithm `std::fill_n()` and let the compiler determine the optimal way of looping or using `memset()`.
This commit is contained in:
parent
742ee21349
commit
76e13b586f
1 changed files with 3 additions and 13 deletions
|
@ -10,6 +10,7 @@
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <iterator>
|
#include <iterator>
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
|
@ -198,22 +199,11 @@ private:
|
||||||
const T* item_ptr(difference_type pos) const { return is_direct() ? direct_ptr(pos) : indirect_ptr(pos); }
|
const T* item_ptr(difference_type pos) const { return is_direct() ? direct_ptr(pos) : indirect_ptr(pos); }
|
||||||
|
|
||||||
void fill(T* dst, ptrdiff_t count) {
|
void fill(T* dst, ptrdiff_t count) {
|
||||||
if (IS_TRIVIALLY_CONSTRUCTIBLE<T>::value) {
|
std::fill_n(dst, count, T{});
|
||||||
// The most common use of prevector is where T=unsigned char. For
|
|
||||||
// trivially constructible types, we can use memset() to avoid
|
|
||||||
// looping.
|
|
||||||
::memset(dst, 0, count * sizeof(T));
|
|
||||||
} else {
|
|
||||||
for (auto i = 0; i < count; ++i) {
|
|
||||||
new(static_cast<void*>(dst + i)) T();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void fill(T* dst, ptrdiff_t count, const T& value) {
|
void fill(T* dst, ptrdiff_t count, const T& value) {
|
||||||
for (auto i = 0; i < count; ++i) {
|
std::fill_n(dst, count, value);
|
||||||
new(static_cast<void*>(dst + i)) T(value);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename InputIterator>
|
template<typename InputIterator>
|
||||||
|
|
Loading…
Reference in a new issue