diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2017-05-04 15:11:11 -0700 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2017-05-04 15:11:11 -0700 |
commit | 8859c07a35d9c2c02b6565627fbbc87c152cb731 (patch) | |
tree | d07cc456ac80f8f18d5cc195e2046566cd6a807e /src/google | |
parent | dd0a23325de0c7a746063c37a5c7b8db1a2c6813 (diff) | |
download | protobuf-8859c07a35d9c2c02b6565627fbbc87c152cb731.tar.gz protobuf-8859c07a35d9c2c02b6565627fbbc87c152cb731.tar.bz2 protobuf-8859c07a35d9c2c02b6565627fbbc87c152cb731.zip |
Add missing files to build files.
Diffstat (limited to 'src/google')
-rw-r--r-- | src/google/protobuf/generated_message_table_driven.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/generated_message_table_driven.cc b/src/google/protobuf/generated_message_table_driven.cc index e281266d..f8fda9c6 100644 --- a/src/google/protobuf/generated_message_table_driven.cc +++ b/src/google/protobuf/generated_message_table_driven.cc @@ -74,7 +74,7 @@ inline Arena* GetArena(MessageLite* msg, int64 arena_offset) { template <typename Type> inline Type* AddField(MessageLite* msg, int64 offset) { #if LANG_CXX11 - static_assert(std::is_trivially_copy_assignable<Type>::value, + static_assert(google::protobuf::internal::has_trivial_copy<Type>::value, "Do not assign"); #endif @@ -94,7 +94,7 @@ inline string* AddField<string>(MessageLite* msg, int64 offset) { template <typename Type> inline void AddField(MessageLite* msg, int64 offset, Type value) { #if LANG_CXX11 - static_assert(std::is_trivially_copy_assignable<Type>::value, + static_assert(google::protobuf::internal::has_trivial_copy<Type>::value, "Do not assign"); #endif *AddField<Type>(msg, offset) = value; @@ -118,7 +118,7 @@ template <typename Type> inline void SetField(MessageLite* msg, uint32* has_bits, uint32 has_bit_index, int64 offset, Type value) { #if LANG_CXX11 - static_assert(std::is_trivially_copy_assignable<Type>::value, + static_assert(google::protobuf::internal::has_trivial_copy<Type>::value, "Do not assign"); #endif *MutableField<Type>(msg, has_bits, has_bit_index, offset) = value; |