third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_gcc.h - Issue 10793026: Roll Protobuf r415:r423.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_gcc.h

Issue 10793026: Roll Protobuf r415:r423. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/src/google/protobuf/stubs/atomicops.h ('k') | third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_gcc.h

diff --git a/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_gcc.h b/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_gcc.h

index 3138590c20b98da3b420e3826394134234bf6db7..1f4dedc0f3785028b2284f651c570e882b224dc3 100644

--- a/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_gcc.h

+++ b/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_gcc.h

@@ -1,17 +1,20 @@

+// Protocol Buffers - Google's data interchange format

+// http://code.google.com/p/protobuf/

+//

// Redistribution and use in source and binary forms, with or without

// modification, are permitted provided that the following conditions are

// met:

// * Redistributions of source code must retain the above copyright

-// notice, this list of conditions and the following disclaimer.

+// notice, this list of conditions and the following disclaimer.

// * Redistributions in binary form must reproduce the above

-// copyright notice, this list of conditions and the following

-// disclaimer in the documentation and/or other materials provided

-// with the distribution.

+// copyright notice, this list of conditions and the following disclaimer

+// in the documentation and/or other materials provided with the

+// distribution.

// * Neither the name of Google Inc. nor the names of its

-// contributors may be used to endorse or promote products derived

-// from this software without specific prior written permission.

+// contributors may be used to endorse or promote products derived from

+// this software without specific prior written permission.

// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT