From 33165fe0d5c265c92f2a67fc2b437b567c24e294 Mon Sep 17 00:00:00 2001
From: "liujisi@google.com"
 <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d>
Date: Tue, 2 Nov 2010 13:14:58 +0000
Subject: Submit recent changes from internal branch. See CHANGES.txt for more
 details.

---
 src/google/protobuf/generated_message_util.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/google/protobuf/generated_message_util.h')

diff --git a/src/google/protobuf/generated_message_util.h b/src/google/protobuf/generated_message_util.h
index daa16f77..1a2343d4 100644
--- a/src/google/protobuf/generated_message_util.h
+++ b/src/google/protobuf/generated_message_util.h
@@ -38,6 +38,8 @@
 #ifndef GOOGLE_PROTOBUF_GENERATED_MESSAGE_UTIL_H__
 #define GOOGLE_PROTOBUF_GENERATED_MESSAGE_UTIL_H__
 
+#include <string>
+
 #include <google/protobuf/stubs/common.h>
 
 
@@ -66,8 +68,11 @@ namespace internal {
 
 
 // Constants for special floating point values.
-LIBPROTOBUF_EXPORT double Infinity();
-LIBPROTOBUF_EXPORT double NaN();
+double Infinity();
+double NaN();
+
+// Constant used for empty default strings.
+extern const ::std::string kEmptyString;
 
 
 }  // namespace internal
-- 
cgit v1.2.3