← Back to branch summary

~ubuntu-branches/debian/stretch/protobuf/stretch

« back to all changes in this revision

Viewing changes to src/google/protobuf/message.cc

  • Committer: Package Import Robot
  • Author(s): Robert S. Edmonds
  • Date: 2014-09-11 22:50:10 UTC
  • mfrom: (10.1.9 experimental)
  • Revision ID: package-import@ubuntu.com-20140911225010-wt4yo9dpc1fzuq5g
Tags: 2.6.0-3
Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/google/protobuf/message.cc
32
32
//  Based on original Protocol Buffers design by
33
33
//  Sanjay Ghemawat, Jeff Dean, and others.
34
34
 
35
 
#include <istream>
 
35
#include <iostream>
36
36
#include <stack>
37
37
#include <google/protobuf/stubs/hash.h>
38
38
 
48
48
#include <google/protobuf/reflection_ops.h>
49
49
#include <google/protobuf/wire_format.h>
50
50
#include <google/protobuf/stubs/strutil.h>
51
 
#include <google/protobuf/stubs/map-util.h>
 
51
#include <google/protobuf/stubs/map_util.h>
52
52
#include <google/protobuf/stubs/stl_util.h>
53
53
 
54
54
namespace google {
75
75
void Message::CopyFrom(const Message& from) {
76
76
  const Descriptor* descriptor = GetDescriptor();
77
77
  GOOGLE_CHECK_EQ(from.GetDescriptor(), descriptor)
78
 
    << ": Tried to copy from a message with a different type."
 
78
    << ": Tried to copy from a message with a different type. "
79
79
       "to: " << descriptor->full_name() << ", "
80
80
       "from:" << from.GetDescriptor()->full_name();
81
81
  ReflectionOps::Copy(from, this);
100
100
string Message::InitializationErrorString() const {
101
101
  vector<string> errors;
102
102
  FindInitializationErrors(&errors);
103
 
  return JoinStrings(errors, ", ");
 
103
  return Join(errors, ", ");
104
104
}
105
105
 
106
106
void Message::CheckInitialized() const {
149
149
  return size;
150
150
}
151
151
 
152
 
void Message::SetCachedSize(int size) const {
 
152
void Message::SetCachedSize(int /* size */) const {
153
153
  GOOGLE_LOG(FATAL) << "Message class \"" << GetDescriptor()->full_name()
154
154
             << "\" implements neither SetCachedSize() nor ByteSize().  "
155
155
                "Must implement one or the other.";