From da0afba8f82d77e112d006eef6bde3754f71365b Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Tue, 26 May 2015 13:54:47 -0700 Subject: Remove std::is_trivially_default_constructible. This type_traits is only added after g++ 5.1.0 but we need to support g++ 4+. --- src/google/protobuf/arena.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src') 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 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::value, - "CreateArray requires a trivially constructible type"); - static_assert(std::is_trivially_destructible::value, - "CreateArray requires a trivially destructible type"); -#endif if (arena == NULL) { return static_cast(::operator new[](num_elements * sizeof(T))); } else { -- cgit v1.2.3