diff options
| author |  liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-05-28 21:48:28 +0000 |
|---|---|---|
| committer | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-05-28 21:48:28 +0000 |
| commit | c5553a3d18f80132b9079c5504bc0aa1f7f950a0 (patch) | |
| tree | d3c955211f6f58b74acf17ed8a98fb98f268ab3f /src/google/protobuf/stubs | |
| parent | e7f2937962283d69fd1153ebca46b615fca4a2a2 (diff) | |
Down-integrate pending changes from internal repository after previous release.
Diffstat (limited to 'src/google/protobuf/stubs')
| -rw-r--r-- | src/google/protobuf/stubs/atomicops.h | 4 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/common.cc | 4 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/common.h | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/google/protobuf/stubs/atomicops.h b/src/google/protobuf/stubs/atomicops.h index f389a36b..eb83047b 100644 --- a/src/google/protobuf/stubs/atomicops.h +++ b/src/google/protobuf/stubs/atomicops.h @@ -179,7 +179,7 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR #elif defined(__GNUC__) #if defined(GOOGLE_PROTOBUF_ARCH_IA32) || defined(GOOGLE_PROTOBUF_ARCH_X64) #include <google/protobuf/stubs/atomicops_internals_x86_gcc.h> -#elif defined(GOOGLE_PROTOBUF_ARCH_ARM) +#elif defined(GOOGLE_PROTOBUF_ARCH_ARM) && defined(__linux__) #include <google/protobuf/stubs/atomicops_internals_arm_gcc.h> #elif defined(GOOGLE_PROTOBUF_ARCH_AARCH64) #include <google/protobuf/stubs/atomicops_internals_arm64_gcc.h> @@ -187,7 +187,7 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR #include <google/protobuf/stubs/atomicops_internals_arm_qnx.h> #elif defined(GOOGLE_PROTOBUF_ARCH_MIPS) #include <google/protobuf/stubs/atomicops_internals_mips_gcc.h> -#elif defined(__pnacl__) +#elif defined(__native_client__) #include <google/protobuf/stubs/atomicops_internals_pnacl.h> #else GOOGLE_PROTOBUF_ATOMICOPS_ERROR diff --git a/src/google/protobuf/stubs/common.cc b/src/google/protobuf/stubs/common.cc index e6045026..a4de6363 100644 --- a/src/google/protobuf/stubs/common.cc +++ b/src/google/protobuf/stubs/common.cc @@ -115,8 +115,8 @@ void DefaultLogHandler(LogLevel level, const char* filename, int line, fflush(stderr); // Needed on MSVC. } -void NullLogHandler(LogLevel level, const char* filename, int line, - const string& message) { +void NullLogHandler(LogLevel /* level */, const char* /* filename */, + int /* line */, const string& /* message */) { // Nothing. } diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 0ecd171b..c24be485 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -720,7 +720,8 @@ class LIBPROTOBUF_EXPORT LogFinisher { namespace internal { template<typename T> -T* CheckNotNull(const char *file, int line, const char *name, T* val) { +T* CheckNotNull(const char* /* file */, int /* line */, + const char* name, T* val) { if (val == NULL) { GOOGLE_LOG(FATAL) << name; } |