diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2017-10-18 12:22:18 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-10-18 12:22:18 -0700 |
| commit | 1a7a7fca804afa1cf67f8be5e71092898ba40334 (patch) | |
| tree | 04b3da27c71c607510f34a12cf7856a1b94181ae /src/google/protobuf/duration.pb.cc | |
| parent | c4f59dcc5c13debc572154c8f636b8a9361aacde (diff) | |
Merge from google internal
Diffstat (limited to 'src/google/protobuf/duration.pb.cc')
| -rw-r--r-- | src/google/protobuf/duration.pb.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/google/protobuf/duration.pb.cc b/src/google/protobuf/duration.pb.cc index 01c8c9aa..0a8aad48 100644 --- a/src/google/protobuf/duration.pb.cc +++ b/src/google/protobuf/duration.pb.cc @@ -14,6 +14,10 @@ #include <google/protobuf/generated_message_reflection.h> #include <google/protobuf/reflection_ops.h> #include <google/protobuf/wire_format.h> +// This is a temporary google only hack +#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS +#include "third_party/protobuf/version.h" +#endif // @@protoc_insertion_point(includes) namespace google { namespace protobuf { @@ -28,7 +32,11 @@ namespace protobuf_google_2fprotobuf_2fduration_2eproto { void InitDefaultsDurationImpl() { GOOGLE_PROTOBUF_VERIFY_VERSION; +#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS + ::google::protobuf::internal::InitProtobufDefaultsForceUnique(); +#else ::google::protobuf::internal::InitProtobufDefaults(); +#endif // GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS { void* ptr = &::google::protobuf::_Duration_default_instance_; new (ptr) ::google::protobuf::Duration(); @@ -159,12 +167,7 @@ Duration::~Duration() { } void Duration::SharedDtor() { - ::google::protobuf::Arena* arena = GetArenaNoVirtual(); - GOOGLE_DCHECK(arena == NULL); - if (arena != NULL) { - return; - } - + GOOGLE_DCHECK(GetArenaNoVirtual() == NULL); } void Duration::ArenaDtor(void* object) { |