Skip to content

P
protobuf
Commit 8d61f9c3 authored by Adam Cozzette's avatar Adam Cozzette Committed by GitHub
Browse files
Options

Merge pull request #2729 from MarcelRaad/fix_inline_msvc12 

Fix unresolved symbols with MSVC12 and /Zc:inline
parents b4b0e304 8f9c0a44
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
src/google/protobuf/message.cc
View file @ 8d61f9c3
...@@ -451,8 +451,8 @@ struct ShutdownRepeatedFieldRegister { ...@@ -451,8 +451,8 @@ struct ShutdownRepeatedFieldRegister {
namespace internal { namespace internal {
template<> template<>
#if defined(_MSC_VER) && (_MSC_VER >= 1900) #if defined(_MSC_VER) && (_MSC_VER >= 1800)
// Note: force noinline to workaround MSVC 2015 compiler bug, issue #240 // Note: force noinline to workaround MSVC compiler bug with /Zc:inline, issue #240
GOOGLE_ATTRIBUTE_NOINLINE GOOGLE_ATTRIBUTE_NOINLINE
#endif #endif
Message* GenericTypeHandler<Message>::NewFromPrototype( Message* GenericTypeHandler<Message>::NewFromPrototype(
...@@ -460,8 +460,8 @@ Message* GenericTypeHandler<Message>::NewFromPrototype( ...@@ -460,8 +460,8 @@ Message* GenericTypeHandler<Message>::NewFromPrototype(
return prototype->New(arena); return prototype->New(arena);
} }
template<> template<>
#if defined(_MSC_VER) && (_MSC_VER >= 1900) #if defined(_MSC_VER) && (_MSC_VER >= 1800)
// Note: force noinline to workaround MSVC 2015 compiler bug, issue #240 // Note: force noinline to workaround MSVC compiler bug with /Zc:inline, issue #240
GOOGLE_ATTRIBUTE_NOINLINE GOOGLE_ATTRIBUTE_NOINLINE
#endif #endif
google::protobuf::Arena* GenericTypeHandler<Message>::GetArena( google::protobuf::Arena* GenericTypeHandler<Message>::GetArena(
...@@ -469,8 +469,8 @@ google::protobuf::Arena* GenericTypeHandler<Message>::GetArena( ...@@ -469,8 +469,8 @@ google::protobuf::Arena* GenericTypeHandler<Message>::GetArena(
return value->GetArena(); return value->GetArena();
} }
template<> template<>
#if defined(_MSC_VER) && (_MSC_VER >= 1900) #if defined(_MSC_VER) && (_MSC_VER >= 1800)
// Note: force noinline to workaround MSVC 2015 compiler bug, issue #240 // Note: force noinline to workaround MSVC compiler bug with /Zc:inline, issue #240
GOOGLE_ATTRIBUTE_NOINLINE GOOGLE_ATTRIBUTE_NOINLINE
#endif #endif
void* GenericTypeHandler<Message>::GetMaybeArenaPointer( void* GenericTypeHandler<Message>::GetMaybeArenaPointer(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment