Internal change.

PiperOrigin-RevId: 584276582
pull/14810/head
Protobuf Team Bot 1 year ago committed by Copybara-Service
parent c5b3eb8059
commit 08d8b80b22
  1. 13
      src/google/protobuf/repeated_ptr_field.h

@ -113,15 +113,10 @@ struct TypeImplementsMergeBehaviorProbeForMergeFrom {
type;
};
template <typename T, typename = void>
struct TypeImplementsMergeBehavior
: TypeImplementsMergeBehaviorProbeForMergeFrom<T> {};
template <>
struct TypeImplementsMergeBehavior<std::string> {
typedef std::true_type type;
};
template <typename T>
using TypeImplementsMergeBehavior =
absl::disjunction<std::is_same<T, std::string>,
TypeImplementsMergeBehaviorProbeForMergeFrom<T>>;
template <typename T>
struct IsMovable

Loading…
Cancel
Save