diff options
| -rw-r--r-- | src/google/protobuf/stubs/atomicops.h | 10 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/time.cc | 1 |
2 files changed, 5 insertions, 6 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 diff --git a/src/google/protobuf/stubs/time.cc b/src/google/protobuf/stubs/time.cc index 3319a244..49c0412c 100644 --- a/src/google/protobuf/stubs/time.cc +++ b/src/google/protobuf/stubs/time.cc @@ -21,7 +21,6 @@ static const int64 kSecondsFromEraToEpoch = 62135596800LL; static const int64 kMinTime = -62135596800LL; // 0001-01-01T00:00:00 static const int64 kMaxTime = 253402300799LL; // 9999-12-31T23:59:59 -static const int kNanosPerSecond = 1000000000; static const int kNanosPerMillisecond = 1000000; static const int kNanosPerMicrosecond = 1000; |