Просмотр исходного кода

Change is_trivially_copy_assignable -> is_trivial too.

Joshua Haberman 4 лет назад
Родитель
Сommit
beb70bb83e
1 измененных файлов с 3 добавлено и 6 удалено
  1. 3 6
      src/google/protobuf/generated_message_table_driven_lite.h

+ 3 - 6
src/google/protobuf/generated_message_table_driven_lite.h

@@ -87,8 +87,7 @@ inline ExtensionSet* GetExtensionSet(MessageLite* msg, int64 extension_offset) {
 
 
 template <typename Type>
 template <typename Type>
 inline Type* AddField(MessageLite* msg, int64 offset) {
 inline Type* AddField(MessageLite* msg, int64 offset) {
-  static_assert(std::is_trivially_copy_assignable<Type>::value,
-                "Do not assign");
+  static_assert(std::is_trivial<Type>::value, "Do not assign");
 
 
   RepeatedField<Type>* repeated = Raw<RepeatedField<Type>>(msg, offset);
   RepeatedField<Type>* repeated = Raw<RepeatedField<Type>>(msg, offset);
   return repeated->Add();
   return repeated->Add();
@@ -104,8 +103,7 @@ inline std::string* AddField<std::string>(MessageLite* msg, int64 offset) {
 
 
 template <typename Type>
 template <typename Type>
 inline void AddField(MessageLite* msg, int64 offset, Type value) {
 inline void AddField(MessageLite* msg, int64 offset, Type value) {
-  static_assert(std::is_trivially_copy_assignable<Type>::value,
-                "Do not assign");
+  static_assert(std::is_trivial<Type>::value, "Do not assign");
   *AddField<Type>(msg, offset) = value;
   *AddField<Type>(msg, offset) = value;
 }
 }
 
 
@@ -126,8 +124,7 @@ inline Type* MutableField(MessageLite* msg, uint32* has_bits,
 template <typename Type>
 template <typename Type>
 inline void SetField(MessageLite* msg, uint32* has_bits, uint32 has_bit_index,
 inline void SetField(MessageLite* msg, uint32* has_bits, uint32 has_bit_index,
                      int64 offset, Type value) {
                      int64 offset, Type value) {
-  static_assert(std::is_trivially_copy_assignable<Type>::value,
-                "Do not assign");
+  static_assert(std::is_trivial<Type>::value, "Do not assign");
   *MutableField<Type>(msg, has_bits, has_bit_index, offset) = value;
   *MutableField<Type>(msg, has_bits, has_bit_index, offset) = value;
 }
 }