Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(642)

Side by Side Diff: third_party/protobuf/src/google/protobuf/stubs/atomicops.h

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)
Patch Set: Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Protocol Buffers - Google's data interchange format 1 // Protocol Buffers - Google's data interchange format
2 // Copyright 2012 Google Inc. All rights reserved. 2 // Copyright 2012 Google Inc. All rights reserved.
3 // https://developers.google.com/protocol-buffers/ 3 // https://developers.google.com/protocol-buffers/
4 // 4 //
5 // Redistribution and use in source and binary forms, with or without 5 // Redistribution and use in source and binary forms, with or without
6 // modification, are permitted provided that the following conditions are 6 // modification, are permitted provided that the following conditions are
7 // met: 7 // met:
8 // 8 //
9 // * Redistributions of source code must retain the above copyright 9 // * Redistributions of source code must retain the above copyright
10 // notice, this list of conditions and the following disclaimer. 10 // notice, this list of conditions and the following disclaimer.
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 196
197 // Apple. 197 // Apple.
198 #elif defined(GOOGLE_PROTOBUF_OS_APPLE) 198 #elif defined(GOOGLE_PROTOBUF_OS_APPLE)
199 #include <google/protobuf/stubs/atomicops_internals_macosx.h> 199 #include <google/protobuf/stubs/atomicops_internals_macosx.h>
200 200
201 // GCC. 201 // GCC.
202 #elif defined(__GNUC__) 202 #elif defined(__GNUC__)
203 #if defined(GOOGLE_PROTOBUF_ARCH_IA32) || defined(GOOGLE_PROTOBUF_ARCH_X64) 203 #if defined(GOOGLE_PROTOBUF_ARCH_IA32) || defined(GOOGLE_PROTOBUF_ARCH_X64)
204 #include <google/protobuf/stubs/atomicops_internals_x86_gcc.h> 204 #include <google/protobuf/stubs/atomicops_internals_x86_gcc.h>
205 #elif defined(GOOGLE_PROTOBUF_ARCH_ARM) && defined(__linux__) 205 #elif defined(GOOGLE_PROTOBUF_ARCH_ARM) && defined(__linux__)
206 #if (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4))
207 #include <google/protobuf/stubs/atomicops_internals_generic_gcc.h>
208 #else
206 #include <google/protobuf/stubs/atomicops_internals_arm_gcc.h> 209 #include <google/protobuf/stubs/atomicops_internals_arm_gcc.h>
210 #endif
207 #elif defined(GOOGLE_PROTOBUF_ARCH_AARCH64) 211 #elif defined(GOOGLE_PROTOBUF_ARCH_AARCH64)
208 #include <google/protobuf/stubs/atomicops_internals_arm64_gcc.h> 212 #include <google/protobuf/stubs/atomicops_internals_arm64_gcc.h>
209 #elif defined(GOOGLE_PROTOBUF_ARCH_ARM_QNX) 213 #elif defined(GOOGLE_PROTOBUF_ARCH_ARM_QNX)
210 #include <google/protobuf/stubs/atomicops_internals_arm_qnx.h> 214 #include <google/protobuf/stubs/atomicops_internals_arm_qnx.h>
211 #elif defined(GOOGLE_PROTOBUF_ARCH_MIPS) || defined(GOOGLE_PROTOBUF_ARCH_MIPS64) 215 #elif defined(GOOGLE_PROTOBUF_ARCH_MIPS) || defined(GOOGLE_PROTOBUF_ARCH_MIPS64)
212 #include <google/protobuf/stubs/atomicops_internals_mips_gcc.h> 216 #include <google/protobuf/stubs/atomicops_internals_mips_gcc.h>
213 #elif defined(GOOGLE_PROTOBUF_ARCH_POWER) 217 #elif defined(GOOGLE_PROTOBUF_ARCH_POWER)
214 #include <google/protobuf/stubs/atomicops_internals_power.h> 218 #include <google/protobuf/stubs/atomicops_internals_power.h>
215 #elif defined(__native_client__) 219 #elif defined(__native_client__)
216 #include <google/protobuf/stubs/atomicops_internals_pnacl.h> 220 #include <google/protobuf/stubs/atomicops_internals_pnacl.h>
(...skipping 20 matching lines...) Expand all
237 // compatible with our other Atomic* types. 241 // compatible with our other Atomic* types.
238 #if defined(GOOGLE_PROTOBUF_OS_APPLE) 242 #if defined(GOOGLE_PROTOBUF_OS_APPLE)
239 #include <google/protobuf/stubs/atomicops_internals_atomicword_compat.h> 243 #include <google/protobuf/stubs/atomicops_internals_atomicword_compat.h>
240 #endif 244 #endif
241 245
242 #undef GOOGLE_PROTOBUF_ATOMICOPS_ERROR 246 #undef GOOGLE_PROTOBUF_ATOMICOPS_ERROR
243 247
244 #endif // GOOGLE_PROTOBUF_NO_THREAD_SAFETY 248 #endif // GOOGLE_PROTOBUF_NO_THREAD_SAFETY
245 249
246 #endif // GOOGLE_PROTOBUF_ATOMICOPS_H_ 250 #endif // GOOGLE_PROTOBUF_ATOMICOPS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698