diff options
| author |  Adam Cozzette <acozzette@gmail.com> | 2018-07-09 11:45:39 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-09 11:45:39 -0700 |
| commit | 4129b6aaad1aa9d48dea1b4ad64c2a64747cb537 (patch) | |
| tree | 528cf866e94f2dcc3e55d45dce3cf42ef60848bc /src/google/protobuf/message_lite.h | |
| parent | 61476b8e74357ea875f71bb321874ca4530b7d50 (diff) | |
| parent | e1845779ed1115dd61eb2a3b8f0a78c252ca5b2b (diff) | |
Merge pull request #4882 from google/3.6.x
Merge 3.6.x into master
Diffstat (limited to 'src/google/protobuf/message_lite.h')
| -rw-r--r-- | src/google/protobuf/message_lite.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/google/protobuf/message_lite.h b/src/google/protobuf/message_lite.h index 4cbec330..b8644142 100644 --- a/src/google/protobuf/message_lite.h +++ b/src/google/protobuf/message_lite.h @@ -129,19 +129,11 @@ class ExplicitlyConstructed { // Default empty string object. Don't use this directly. Instead, call // GetEmptyString() to get the reference. LIBPROTOBUF_EXPORT extern ExplicitlyConstructed<::std::string> fixed_address_empty_string; -LIBPROTOBUF_EXPORT extern ProtobufOnceType empty_string_once_init_; -LIBPROTOBUF_EXPORT void InitEmptyString(); - LIBPROTOBUF_EXPORT inline const ::std::string& GetEmptyStringAlreadyInited() { return fixed_address_empty_string.get(); } -LIBPROTOBUF_EXPORT inline const ::std::string& GetEmptyString() { - ::google::protobuf::GoogleOnceInit(&empty_string_once_init_, &InitEmptyString); - return GetEmptyStringAlreadyInited(); -} - LIBPROTOBUF_EXPORT size_t StringSpaceUsedExcludingSelfLong(const string& str); #endif // SWIG } // namespace internal |