diff options
| author |  Adam Cozzette <acozzette@gmail.com> | 2017-02-27 08:29:10 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-02-27 08:29:10 -0800 |
| commit | 8d61f9c3bf4ba1c1705fe773b820a60f44737246 (patch) | |
| tree | acf1a7e42e6880f0c92420f1f695d815cfc811c1 | |
| parent | b4b0e304be5a68de3d0ee1af9b286f958750f5e4 (diff) | |
| parent | 8f9c0a44bd27594a42a3bf28eab605e4898c717c (diff) | |
Merge pull request #2729 from MarcelRaad/fix_inline_msvc12
Fix unresolved symbols with MSVC12 and /Zc:inline
| -rw-r--r-- | src/google/protobuf/message.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/google/protobuf/message.cc b/src/google/protobuf/message.cc index b799dead..6800e4cd 100644 --- a/src/google/protobuf/message.cc +++ b/src/google/protobuf/message.cc @@ -451,8 +451,8 @@ struct ShutdownRepeatedFieldRegister { namespace internal { template<> -#if defined(_MSC_VER) && (_MSC_VER >= 1900) -// Note: force noinline to workaround MSVC 2015 compiler bug, issue #240 +#if defined(_MSC_VER) && (_MSC_VER >= 1800) +// Note: force noinline to workaround MSVC compiler bug with /Zc:inline, issue #240 GOOGLE_ATTRIBUTE_NOINLINE #endif Message* GenericTypeHandler<Message>::NewFromPrototype( @@ -460,8 +460,8 @@ 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 +#if defined(_MSC_VER) && (_MSC_VER >= 1800) +// Note: force noinline to workaround MSVC compiler bug with /Zc:inline, issue #240 GOOGLE_ATTRIBUTE_NOINLINE #endif google::protobuf::Arena* GenericTypeHandler<Message>::GetArena( @@ -469,8 +469,8 @@ google::protobuf::Arena* GenericTypeHandler<Message>::GetArena( return value->GetArena(); } template<> -#if defined(_MSC_VER) && (_MSC_VER >= 1900) -// Note: force noinline to workaround MSVC 2015 compiler bug, issue #240 +#if defined(_MSC_VER) && (_MSC_VER >= 1800) +// Note: force noinline to workaround MSVC compiler bug with /Zc:inline, issue #240 GOOGLE_ATTRIBUTE_NOINLINE #endif void* GenericTypeHandler<Message>::GetMaybeArenaPointer( |