Browse Source

Merge pull request #429 from xfxyjwf/std11_fix

Remove std::is_trivially_default_constructible.
Paul Yang 10 years ago
parent
commit
1b540d5729
1 changed files with 0 additions and 6 deletions
  1. 0 6
      src/google/protobuf/arena.h

+ 0 - 6
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 {