diff options
| author | Paul Yang <TeBoring@users.noreply.github.com> | 2015-05-26 14:24:59 -0700 |
|---|---|---|
| committer | Paul Yang <TeBoring@users.noreply.github.com> | 2015-05-26 14:24:59 -0700 |
| commit | 1b540d5729b6e09eafe09261664a5b981761464b (patch) | |
| tree | d9134b4ef68927c613b802fcf48c9c835a820ca3 | |
| parent | 83d334f713b814dfff2d76e189a8245c8e296792 (diff) | |
| parent | da0afba8f82d77e112d006eef6bde3754f71365b (diff) | |
| download | protobuf-1b540d5729b6e09eafe09261664a5b981761464b.tar.gz protobuf-1b540d5729b6e09eafe09261664a5b981761464b.tar.bz2 protobuf-1b540d5729b6e09eafe09261664a5b981761464b.zip | |
Merge pull request #429 from xfxyjwf/std11_fix
Remove std::is_trivially_default_constructible.
| -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 { |