Minor cleanup: IWYU, clang-tidy, etc.

PiperOrigin-RevId: 613349591
pull/16082/head
Protobuf Team Bot 9 months ago committed by Copybara-Service
parent 16528d89c5
commit 3b6e659d95
  1. 5
      src/google/protobuf/message.cc

@ -15,8 +15,9 @@
#include <cstddef>
#include <cstdint>
#include <cstring>
#include <new>
#include <new> // IWYU pragma: keep for operator new().
#include <string>
#include <vector>
#include "absl/base/call_once.h"
#include "absl/base/optimization.h"
@ -44,7 +45,6 @@
#include "google/protobuf/reflection_ops.h"
#include "google/protobuf/unknown_field_set.h"
#include "google/protobuf/wire_format.h"
#include "google/protobuf/wire_format_lite.h"
// Must be included last.
@ -64,7 +64,6 @@ void RegisterFileLevelMetadata(const DescriptorTable* descriptor_table);
using internal::DownCast;
using internal::ReflectionOps;
using internal::WireFormat;
using internal::WireFormatLite;
void Message::MergeImpl(MessageLite& to, const MessageLite& from) {
ReflectionOps::Merge(DownCast<const Message&>(from), DownCast<Message*>(&to));

Loading…
Cancel
Save