AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge pull request #569 from redivo/master

Browse Source 
Fix GOOGLE_PROTOBUF_ATOMICOPS_ERROR syntax error
This commit is contained in:
Feng Xiao 2015-08-28 13:34:35 -07:00
commit 67946e98a9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/google/protobuf/stubs/atomicops.h
View File

@ -173,7 +173,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr);
// Include our platform specific implementation. // Include our platform specific implementation.
#define GOOGLE_PROTOBUF_ATOMICOPS_ERROR \ #define GOOGLE_PROTOBUF_ATOMICOPS_ERROR \
#error "Atomic operations are not supported on your platform" "Atomic operations are not supported on your platform"
// ThreadSanitizer, http://clang.llvm.org/docs/ThreadSanitizer.html. // ThreadSanitizer, http://clang.llvm.org/docs/ThreadSanitizer.html.
#if defined(THREAD_SANITIZER) #if defined(THREAD_SANITIZER)
@ -183,7 +183,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr);
#if defined(GOOGLE_PROTOBUF_ARCH_IA32) || defined(GOOGLE_PROTOBUF_ARCH_X64) #if defined(GOOGLE_PROTOBUF_ARCH_IA32) || defined(GOOGLE_PROTOBUF_ARCH_X64)
#include <google/protobuf/stubs/atomicops_internals_x86_msvc.h> #include <google/protobuf/stubs/atomicops_internals_x86_msvc.h>
#else #else
GOOGLE_PROTOBUF_ATOMICOPS_ERROR #error GOOGLE_PROTOBUF_ATOMICOPS_ERROR
#endif #endif
// Solaris // Solaris
@ -218,15 +218,15 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR
#if __has_extension(c_atomic) #if __has_extension(c_atomic)
#include <google/protobuf/stubs/atomicops_internals_generic_gcc.h> #include <google/protobuf/stubs/atomicops_internals_generic_gcc.h>
#else #else
GOOGLE_PROTOBUF_ATOMICOPS_ERROR #error GOOGLE_PROTOBUF_ATOMICOPS_ERROR
#endif #endif
#else #else
GOOGLE_PROTOBUF_ATOMICOPS_ERROR #error GOOGLE_PROTOBUF_ATOMICOPS_ERROR
#endif #endif
// Unknown. // Unknown.
#else #else
GOOGLE_PROTOBUF_ATOMICOPS_ERROR #error GOOGLE_PROTOBUF_ATOMICOPS_ERROR
#endif #endif
// On some platforms we need additional declarations to make AtomicWord // On some platforms we need additional declarations to make AtomicWord