AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge pull request #429 from xfxyjwf/std11_fix

Browse Source 
Remove std::is_trivially_default_constructible.
This commit is contained in:
Paul Yang 2015-05-26 14:24:59 -07:00
commit 1b540d5729
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/google/protobuf/arena.h
View File

@ -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 {