diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2016-02-10 14:12:29 -0800 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2016-02-10 14:12:29 -0800 |
commit | a924e0b85872299b06fe826be7000f12f97d7776 (patch) | |
tree | 05139e0b3a134db216389471ad12358f00a5162d /src | |
parent | 18fba0f13871ec40a9d404ef433e8a3c8c91c99a (diff) | |
parent | 714b6b761bea78c9b8229b94645997cecb945a4d (diff) | |
download | protobuf-a924e0b85872299b06fe826be7000f12f97d7776.tar.gz protobuf-a924e0b85872299b06fe826be7000f12f97d7776.tar.bz2 protobuf-a924e0b85872299b06fe826be7000f12f97d7776.zip |
Merge pull request #1185 from kkm000/icl-fix
Fix Intel compiler warnings in include files on Windows
Diffstat (limited to 'src')
-rw-r--r-- | src/google/protobuf/io/coded_stream.h | 6 | ||||
-rw-r--r-- | src/google/protobuf/stubs/port.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/google/protobuf/io/coded_stream.h b/src/google/protobuf/io/coded_stream.h index 020f20c7..e3771003 100644 --- a/src/google/protobuf/io/coded_stream.h +++ b/src/google/protobuf/io/coded_stream.h @@ -117,7 +117,7 @@ #if !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST) #define PROTOBUF_LITTLE_ENDIAN 1 #endif - #if _MSC_VER >= 1300 + #if _MSC_VER >= 1300 && !defined(__INTEL_COMPILER) // If MSVC has "/RTCc" set, it will complain about truncating casts at // runtime. This file contains some intentional truncating casts. #pragma runtime_checks("c", off) @@ -1286,9 +1286,9 @@ inline bool CodedInputStream::IsFlat() const { } // namespace protobuf -#if defined(_MSC_VER) && _MSC_VER >= 1300 +#if _MSC_VER >= 1300 && !defined(__INTEL_COMPILER) #pragma runtime_checks("c", restore) -#endif // _MSC_VER +#endif // _MSC_VER && !defined(__INTEL_COMPILER) } // namespace google #endif // GOOGLE_PROTOBUF_IO_CODED_STREAM_H__ diff --git a/src/google/protobuf/stubs/port.h b/src/google/protobuf/stubs/port.h index b35a3afe..1036dff1 100644 --- a/src/google/protobuf/stubs/port.h +++ b/src/google/protobuf/stubs/port.h @@ -53,7 +53,7 @@ #if !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST) #define PROTOBUF_LITTLE_ENDIAN 1 #endif - #if defined(_MSC_VER) && _MSC_VER >= 1300 + #if _MSC_VER >= 1300 && !defined(__INTEL_COMPILER) // If MSVC has "/RTCc" set, it will complain about truncating casts at // runtime. This file contains some intentional truncating casts. #pragma runtime_checks("c", off) |