Skip to content

P
protobuf
Commit 1b540d57 authored by Paul Yang's avatar Paul Yang
Browse files
Options

Merge pull request #429 from xfxyjwf/std11_fix 

Remove std::is_trivially_default_constructible.
parents 83d334f7 da0afba8
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
src/google/protobuf/arena.h
View file @ 1b540d57
...@@ -413,12 +413,6 @@ class LIBPROTOBUF_EXPORT Arena { ...@@ -413,12 +413,6 @@ class LIBPROTOBUF_EXPORT Arena {
// trivially destructible. // trivially destructible.
template <typename T> GOOGLE_ATTRIBUTE_ALWAYS_INLINE template <typename T> GOOGLE_ATTRIBUTE_ALWAYS_INLINE
static T* CreateArray(::google::protobuf::Arena* arena, size_t num_elements) { static T* CreateArray(::google::protobuf::Arena* arena, size_t num_elements) {
#if __cplusplus >= 201103L
static_assert(std::is_trivially_default_constructible<T>::value,
"CreateArray requires a trivially constructible type");
static_assert(std::is_trivially_destructible<T>::value,
"CreateArray requires a trivially destructible type");
#endif
if (arena == NULL) { if (arena == NULL) {
return static_cast<T*>(::operator new[](num_elements * sizeof(T))); return static_cast<T*>(::operator new[](num_elements * sizeof(T)));
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment