From 7ad8690c5d8a875881ba00c3551595a2676538ef Mon Sep 17 00:00:00 2001 From: George Redivo Date: Mon, 6 Jul 2015 16:56:41 -0300 Subject: Fix GOOGLE_PROTOBUF_ATOMICOPS_ERROR syntax error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's not possible to define "#error" inside a define. It causes 'error: stray ‘#’ in program' compilation error. Now the define GOOGLE_PROTOBUF_ATOMICOPS_ERROR is the error message and it's used along the code together "#error". --- src/google/protobuf/stubs/atomicops.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/google') 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 #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 #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 -- cgit v1.2.3