diff options
| author |  Feng Xiao <xiaofeng@google.com> | 2015-08-28 13:34:35 -0700 |
|---|---|---|
| committer | Feng Xiao <xiaofeng@google.com> | 2015-08-28 13:34:35 -0700 |
| commit | 67946e98a94ae252e9ef54e7700da9bf8fe9e8f4 (patch) | |
| tree | e01d877ba6b38baa7a0e241a26174bec73aa2f89 /src/google | |
| parent | fb0af6d02eab821891fb245ea5a4fe9f1f2ac01d (diff) | |
| parent | 7ad8690c5d8a875881ba00c3551595a2676538ef (diff) | |
Merge pull request #569 from redivo/master
Fix GOOGLE_PROTOBUF_ATOMICOPS_ERROR syntax error
Diffstat (limited to 'src/google')
| -rw-r--r-- | src/google/protobuf/stubs/atomicops.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/google/protobuf/stubs/atomicops.h b/src/google/protobuf/stubs/atomicops.h index cd20caac..5fa31b0a 100644 --- a/src/google/protobuf/stubs/atomicops.h +++ b/src/google/protobuf/stubs/atomicops.h @@ -173,7 +173,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr); // Include our platform specific implementation. #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. #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) #include <google/protobuf/stubs/atomicops_internals_x86_msvc.h> #else -GOOGLE_PROTOBUF_ATOMICOPS_ERROR +#error GOOGLE_PROTOBUF_ATOMICOPS_ERROR #endif // Solaris @@ -218,15 +218,15 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR #if __has_extension(c_atomic) #include <google/protobuf/stubs/atomicops_internals_generic_gcc.h> #else -GOOGLE_PROTOBUF_ATOMICOPS_ERROR +#error GOOGLE_PROTOBUF_ATOMICOPS_ERROR #endif #else -GOOGLE_PROTOBUF_ATOMICOPS_ERROR +#error GOOGLE_PROTOBUF_ATOMICOPS_ERROR #endif // Unknown. #else -GOOGLE_PROTOBUF_ATOMICOPS_ERROR +#error GOOGLE_PROTOBUF_ATOMICOPS_ERROR #endif // On some platforms we need additional declarations to make AtomicWord |