diff options
author | Jisi Liu <jisi.liu@gmail.com> | 2015-10-05 13:54:05 -0700 |
---|---|---|
committer | Jisi Liu <jisi.liu@gmail.com> | 2015-10-05 13:54:05 -0700 |
commit | 8d8177c75701014dfe27fec4cdd2b1647aefcb67 (patch) | |
tree | fdc5d0d0f2fd57f2ca641069c20b34ddf90ec919 /src/google/protobuf/message.cc | |
parent | 46e8ff63cb67a6520711da5317aaaef04d0414d0 (diff) | |
parent | cccf6fed7e2fad1240bb48ba0c47f3978ff7433d (diff) |
Merge remote-tracking branch 'origin/master' into fix-author
Diffstat (limited to 'src/google/protobuf/message.cc')
-rw-r--r-- | src/google/protobuf/message.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/google/protobuf/message.cc b/src/google/protobuf/message.cc index d9c200c6..032748bd 100644 --- a/src/google/protobuf/message.cc +++ b/src/google/protobuf/message.cc @@ -494,11 +494,19 @@ Message* GenericTypeHandler<Message>::NewFromPrototype( return prototype->New(arena); } template<> +#if defined(_MSC_VER) && (_MSC_VER >= 1900) +// Note: force noinline to workaround MSVC 2015 compiler bug, issue #240 +GOOGLE_ATTRIBUTE_NOINLINE +#endif google::protobuf::Arena* GenericTypeHandler<Message>::GetArena( Message* value) { return value->GetArena(); } template<> +#if defined(_MSC_VER) && (_MSC_VER >= 1900) +// Note: force noinline to workaround MSVC 2015 compiler bug, issue #240 +GOOGLE_ATTRIBUTE_NOINLINE +#endif void* GenericTypeHandler<Message>::GetMaybeArenaPointer( Message* value) { return value->GetMaybeArenaPointer(); |