Down-integrate from internal branch

1 files changed, 8 insertions, 13 deletions

diff --git a/src/google/protobuf/generated_message_util.h b/src/google/protobuf/generated_message_util.h
index 77ae1064..b2fb8f0b 100644
--- a/src/google/protobuf/generated_message_util.h
+++ b/src/google/protobuf/generated_message_util.h
@@ -41,16 +41,8 @@
 #include <string>
 
 #include <google/protobuf/stubs/common.h>
-
-
 namespace google {
 namespace protobuf {
-  namespace io {
-    class CodedInputStream;      // coded_stream.h
-  }
-}
-
-namespace protobuf {
 namespace internal {
 
 // Annotation for the compiler to emit a deprecation message if a field marked
@@ -60,11 +52,7 @@ namespace internal {
 // For internal use in the pb.cc files, deprecation warnings are suppressed
 // there.
 #undef DEPRECATED_PROTOBUF_FIELD
-#if !defined(INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION)
-#  define PROTOBUF_DEPRECATED GOOGLE_ATTRIBUTE_DEPRECATED
-#else
-#  define PROTOBUF_DEPRECATED
-#endif
+#define PROTOBUF_DEPRECATED
 
 
 // Constants for special floating point values.
@@ -74,6 +62,13 @@ LIBPROTOBUF_EXPORT double NaN();
 // Constant used for empty default strings.
 LIBPROTOBUF_EXPORT extern const ::std::string kEmptyString;
 
+// Defined in generated_message_reflection.cc -- not actually part of the lite
+// library.
+//
+// TODO(jasonh): The various callers get this declaration from a variety of
+// places: probably in most cases repeated_field.h. Clean these up so they all
+// get the declaration from this file.
+LIBPROTOBUF_EXPORT int StringSpaceUsedExcludingSelf(const string& str);
 
 }  // namespace internal
 }  // namespace protobuf