Down-integrate from internal branch.

3 files changed, 14 insertions, 15 deletions

diff --git a/examples/list_people.cc b/examples/list_people.cc
index d0f40d61..5363152e 100644
--- a/examples/list_people.cc
+++ b/examples/list_people.cc
@@ -4,7 +4,6 @@
 #include <fstream>
 #include <string>
 #include "addressbook.pb.h"
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
 using namespace std;
 
 // Iterates though all people in the AddressBook and prints info about them.
diff --git a/src/google/protobuf/descriptor.h b/src/google/protobuf/descriptor.h
index 150008bf..67afc774 100644
--- a/src/google/protobuf/descriptor.h
+++ b/src/google/protobuf/descriptor.h
@@ -1594,44 +1594,44 @@ inline bool FieldDescriptor::is_packable() const {
 // in the parent's array of children.
 inline int FieldDescriptor::index() const {
   if (!is_extension_) {
-    return this - containing_type_->fields_;
+    return static_cast<int>(this - containing_type_->fields_);
   } else if (extension_scope_ != NULL) {
-    return this - extension_scope_->extensions_;
+    return static_cast<int>(this - extension_scope_->extensions_);
   } else {
-    return this - file_->extensions_;
+    return static_cast<int>(this - file_->extensions_);
   }
 }
 
 inline int Descriptor::index() const {
   if (containing_type_ == NULL) {
-    return this - file_->message_types_;
+    return static_cast<int>(this - file_->message_types_);
   } else {
-    return this - containing_type_->nested_types_;
+    return static_cast<int>(this - containing_type_->nested_types_);
   }
 }
 
 inline int OneofDescriptor::index() const {
-  return this - containing_type_->oneof_decls_;
+  return static_cast<int>(this - containing_type_->oneof_decls_);
 }
 
 inline int EnumDescriptor::index() const {
   if (containing_type_ == NULL) {
-    return this - file_->enum_types_;
+    return static_cast<int>(this - file_->enum_types_);
   } else {
-    return this - containing_type_->enum_types_;
+    return static_cast<int>(this - containing_type_->enum_types_);
   }
 }
 
 inline int EnumValueDescriptor::index() const {
-  return this - type_->values_;
+  return static_cast<int>(this - type_->values_);
 }
 
 inline int ServiceDescriptor::index() const {
-  return this - file_->services_;
+  return static_cast<int>(this - file_->services_);
 }
 
 inline int MethodDescriptor::index() const {
-  return this - service_->methods_;
+  return static_cast<int>(this - service_->methods_);
 }
 
 inline const char* FieldDescriptor::type_name() const {
diff --git a/src/google/protobuf/unknown_field_set.h b/src/google/protobuf/unknown_field_set.h
index 108a0e12..ba202eb6 100644
--- a/src/google/protobuf/unknown_field_set.h
+++ b/src/google/protobuf/unknown_field_set.h
@@ -138,7 +138,7 @@ class LIBPROTOBUF_EXPORT UnknownFieldSet {
   bool ParseFromZeroCopyStream(io::ZeroCopyInputStream* input);
   bool ParseFromArray(const void* data, int size);
   inline bool ParseFromString(const string& data) {
-    return ParseFromArray(data.data(), data.size());
+    return ParseFromArray(data.data(), static_cast<int>(data.size()));
   }
 
  private:
@@ -236,7 +236,7 @@ inline void UnknownFieldSet::Swap(UnknownFieldSet* x) {
 }
 
 inline int UnknownFieldSet::field_count() const {
-  return (fields_ == NULL) ? 0 : fields_->size();
+  return (fields_ == NULL) ? 0 : static_cast<int>(fields_->size());
 }
 inline const UnknownField& UnknownFieldSet::field(int index) const {
   return (*fields_)[index];
@@ -304,7 +304,7 @@ inline UnknownFieldSet* UnknownField::mutable_group() {
 
 inline int UnknownField::GetLengthDelimitedSize() const {
   GOOGLE_DCHECK_EQ(TYPE_LENGTH_DELIMITED, type());
-  return length_delimited_.string_value_->size();
+  return static_cast<int>(length_delimited_.string_value_->size());
 }
 
 inline void UnknownField::SetType(Type type) {