diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2015-05-26 13:54:47 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-05-26 13:54:47 -0700 |
| commit | da0afba8f82d77e112d006eef6bde3754f71365b (patch) | |
| tree | 73d3d74c7f9f2077ac506877d525c930ba679500 /src/google/protobuf/arena.h | |
| parent | 3a5455b34bbe7f137ac22e07929d6b88098f6b64 (diff) | |
| download | protobuf-da0afba8f82d77e112d006eef6bde3754f71365b.tar.gz protobuf-da0afba8f82d77e112d006eef6bde3754f71365b.tar.bz2 protobuf-da0afba8f82d77e112d006eef6bde3754f71365b.zip | |
Remove std::is_trivially_default_constructible.
This type_traits is only added after g++ 5.1.0 but we need to support g++ 4+.
Diffstat (limited to 'src/google/protobuf/arena.h')
| -rw-r--r-- | src/google/protobuf/arena.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/google/protobuf/arena.h b/src/google/protobuf/arena.h index 4adcd677..6c3f606e 100644 --- a/src/google/protobuf/arena.h +++ b/src/google/protobuf/arena.h @@ -413,12 +413,6 @@ class LIBPROTOBUF_EXPORT Arena { // trivially destructible. template <typename T> GOOGLE_ATTRIBUTE_ALWAYS_INLINE 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) { return static_cast<T*>(::operator new[](num_elements * sizeof(T))); } else { |