739351d476
Change log:95336cb92b..191d55580eFull diff:95336cb92b..191d55580eRoll chromium third_party 4e16929f46..3a8f2a9e1e Change log:4e16929f46..3a8f2a9e1eChanged dependencies: * src/tools:c44a3f5eca..f524a53b81DEPS diff:95336cb92b..191d55580e/DEPS No update to Clang. TBR=titovartem@google.com, BUG=None CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal Change-Id: Ic9c4a62b050383646e9fcf5cc07a5653c14ac06e Reviewed-on: https://webrtc-review.googlesource.com/76120 Reviewed-by: Patrik Höglund <phoglund@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Reviewed-by: Artem Titov <titovartem@webrtc.org> Commit-Queue: Artem Titov <titovartem@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23205}
21 lines
913 B
Diff
21 lines
913 B
Diff
--- protobuf-cleaned/src/google/protobuf/compiler/cpp/cpp_message.cc 2015-12-30 13:21:46.000000000 -0800
|
|
+++ protobuf-patched/src/google/protobuf/compiler/cpp/cpp_message.cc 2016-03-31 13:25:40.888006485 -0700
|
|
@@ -1035,7 +1035,7 @@
|
|
}
|
|
|
|
printer->Print(vars,
|
|
- "void Swap($classname$* other);\n"
|
|
+ "GOOGLE_ATTRIBUTE_NOINLINE void Swap($classname$* other);\n"
|
|
"\n"
|
|
"// implements Message ----------------------------------------------\n"
|
|
"\n"
|
|
@@ -2586,7 +2586,7 @@
|
|
// ownership situation: swapping across arenas or between an arena and a
|
|
// heap requires copying.
|
|
printer->Print(
|
|
- "void $classname$::Swap($classname$* other) {\n"
|
|
+ "GOOGLE_ATTRIBUTE_NOINLINE void $classname$::Swap($classname$* other) {\n"
|
|
" if (other == this) return;\n"
|
|
" if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {\n"
|
|
" InternalSwap(other);\n"
|