From 5a76e633ea9b5adb215e93fdc11e1c0c08b3fc74 Mon Sep 17 00:00:00 2001
From: Adam Cozzette <acozzette@google.com>
Date: Thu, 17 Nov 2016 16:48:38 -0800
Subject: Integrated internal changes from Google

---
 src/google/protobuf/generated_message_util.cc | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

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

diff --git a/src/google/protobuf/generated_message_util.cc b/src/google/protobuf/generated_message_util.cc
index 73f55927..b4d2c9c1 100644
--- a/src/google/protobuf/generated_message_util.cc
+++ b/src/google/protobuf/generated_message_util.cc
@@ -51,9 +51,7 @@ double NaN() {
 ExplicitlyConstructed< ::std::string> fixed_address_empty_string;
 GOOGLE_PROTOBUF_DECLARE_ONCE(empty_string_once_init_);
 
-void DeleteEmptyString() {
-  GetEmptyStringAlreadyInited().~string();
-}
+void DeleteEmptyString() { fixed_address_empty_string.Shutdown(); }
 
 void InitEmptyString() {
   fixed_address_empty_string.DefaultConstruct();
@@ -73,10 +71,8 @@ int StringSpaceUsedExcludingSelf(const string& str) {
 
 
 
-void MergeFromFail(const char* file, int line) {
-  GOOGLE_CHECK(false) << file << ":" << line;
-  // Open-source GOOGLE_CHECK(false) is not NORETURN.
-  exit(1);
+void InitProtobufDefaults() {
+  GetEmptyString();
 }
 
 }  // namespace internal
-- 
cgit v1.2.3