Internal changes

PiperOrigin-RevId: 687342496
pull/18822/head
Protobuf Team Bot 5 months ago committed by Copybara-Service
parent 7d619e8974
commit dcc1c08ef7
  1. 3
      src/google/protobuf/message_lite.cc

@ -38,6 +38,7 @@
#include "google/protobuf/io/zero_copy_stream_impl_lite.h" #include "google/protobuf/io/zero_copy_stream_impl_lite.h"
#include "google/protobuf/metadata_lite.h" #include "google/protobuf/metadata_lite.h"
#include "google/protobuf/parse_context.h" #include "google/protobuf/parse_context.h"
#include "google/protobuf/port.h"
// Must be included last. // Must be included last.
@ -273,7 +274,6 @@ template bool MergeFromImpl<false>(BoundedZCIS input, MessageLite* msg,
template bool MergeFromImpl<true>(BoundedZCIS input, MessageLite* msg, template bool MergeFromImpl<true>(BoundedZCIS input, MessageLite* msg,
const internal::TcParseTableBase* tc_table, const internal::TcParseTableBase* tc_table,
MessageLite::ParseFlags parse_flags); MessageLite::ParseFlags parse_flags);
} // namespace internal } // namespace internal
class ZeroCopyCodedInputStream : public io::ZeroCopyInputStream { class ZeroCopyCodedInputStream : public io::ZeroCopyInputStream {
@ -300,6 +300,7 @@ class ZeroCopyCodedInputStream : public io::ZeroCopyInputStream {
cord->Append(std::move(tmp)); cord->Append(std::move(tmp));
return res; return res;
} }
private: private:
io::CodedInputStream* cis_; io::CodedInputStream* cis_;
}; };

Loading…
Cancel
Save