From 4de8f55113007fdc8e34107950e605fc0209d465 Mon Sep 17 00:00:00 2001
From: "jieluo@google.com"
 <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d>
Date: Fri, 18 Jul 2014 00:47:59 +0000
Subject: down integrate to svn

---
 src/google/protobuf/message.cc | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/google/protobuf/message.cc')

diff --git a/src/google/protobuf/message.cc b/src/google/protobuf/message.cc
index 0c305d56..e838d30c 100644
--- a/src/google/protobuf/message.cc
+++ b/src/google/protobuf/message.cc
@@ -32,7 +32,6 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-#include <istream>
 #include <stack>
 #include <google/protobuf/stubs/hash.h>
 
@@ -48,7 +47,7 @@
 #include <google/protobuf/reflection_ops.h>
 #include <google/protobuf/wire_format.h>
 #include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/map-util.h>
+#include <google/protobuf/stubs/map_util.h>
 #include <google/protobuf/stubs/stl_util.h>
 
 namespace google {
@@ -75,7 +74,7 @@ void Message::CheckTypeAndMergeFrom(const MessageLite& other) {
 void Message::CopyFrom(const Message& from) {
   const Descriptor* descriptor = GetDescriptor();
   GOOGLE_CHECK_EQ(from.GetDescriptor(), descriptor)
-    << ": Tried to copy from a message with a different type."
+    << ": Tried to copy from a message with a different type. "
        "to: " << descriptor->full_name() << ", "
        "from:" << from.GetDescriptor()->full_name();
   ReflectionOps::Copy(from, this);
@@ -100,7 +99,7 @@ void Message::FindInitializationErrors(vector<string>* errors) const {
 string Message::InitializationErrorString() const {
   vector<string> errors;
   FindInitializationErrors(&errors);
-  return JoinStrings(errors, ", ");
+  return Join(errors, ", ");
 }
 
 void Message::CheckInitialized() const {
@@ -216,8 +215,7 @@ HANDLE_TYPE(bool,   FieldDescriptor::CPPTYPE_BOOL,   -1);
 #undef HANDLE_TYPE
 
 void* Reflection::MutableRawRepeatedString(
-    Message* message, const FieldDescriptor* field,
-    bool /* is_string */) const {
+    Message* message, const FieldDescriptor* field, bool is_string) const {
   return MutableRawRepeatedField(message, field,
       FieldDescriptor::CPPTYPE_STRING, FieldOptions::STRING, NULL);
 }
-- 
cgit v1.2.3