diff options
author | Damien Martin-Guillerez <dmarting@google.com> | 2017-07-27 15:51:39 +0200 |
---|---|---|
committer | Jakob Buchgraber <buchgr@google.com> | 2017-07-27 16:26:30 +0200 |
commit | 0f3481ba6364f24ef76b839bdde06ae7883c9bd9 (patch) | |
tree | 2dffea4d43a38aeb6fdaf0052a7ae6b60ea29872 | |
parent | 92caf38a4ae74889391eefa9b7196804d8f2c948 (diff) |
Include <cinttypes> instead of <stdint.h>
cinttypes is the C++ header that should replace stdint.h. Not
using the correct header was leading to compilation error on CentOS 6.7
Fixes #3455.
To be cherry-picked for #3375.
Change-Id: I6df22134a4a4902ec9fa7ecdfaeb5408eacf3564
PiperOrigin-RevId: 163334651
-rw-r--r-- | src/main/cpp/blaze.cc | 2 | ||||
-rw-r--r-- | src/main/cpp/blaze_util_platform.h | 3 | ||||
-rw-r--r-- | src/main/cpp/blaze_util_posix.cc | 2 | ||||
-rw-r--r-- | src/main/cpp/util/file_platform.h | 2 | ||||
-rw-r--r-- | src/main/cpp/util/md5.cc | 3 | ||||
-rw-r--r-- | src/main/cpp/util/numbers.cc | 2 | ||||
-rw-r--r-- | src/main/cpp/util/port.h | 3 | ||||
-rw-r--r-- | src/tools/singlejar/output_jar.h | 3 | ||||
-rw-r--r-- | src/tools/singlejar/zip_headers.h | 3 | ||||
-rw-r--r-- | src/tools/singlejar/zlib_interface.h | 2 |
10 files changed, 14 insertions, 11 deletions
diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc index 0ac61a0b3e..653c67239f 100644 --- a/src/main/cpp/blaze.cc +++ b/src/main/cpp/blaze.cc @@ -30,7 +30,6 @@ #include <fcntl.h> #include <limits.h> #include <stdarg.h> -#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -44,6 +43,7 @@ #include <algorithm> #include <chrono> // NOLINT (gRPC requires this) +#include <cinttypes> #include <mutex> // NOLINT #include <set> #include <string> diff --git a/src/main/cpp/blaze_util_platform.h b/src/main/cpp/blaze_util_platform.h index bb69541a6e..7e5749279d 100644 --- a/src/main/cpp/blaze_util_platform.h +++ b/src/main/cpp/blaze_util_platform.h @@ -15,8 +15,7 @@ #ifndef BAZEL_SRC_MAIN_CPP_BLAZE_UTIL_PLATFORM_H_ #define BAZEL_SRC_MAIN_CPP_BLAZE_UTIL_PLATFORM_H_ -#include <stdint.h> - +#include <cinttypes> #include <string> #include <vector> diff --git a/src/main/cpp/blaze_util_posix.cc b/src/main/cpp/blaze_util_posix.cc index 42fa76206c..4915f99d1d 100644 --- a/src/main/cpp/blaze_util_posix.cc +++ b/src/main/cpp/blaze_util_posix.cc @@ -15,7 +15,6 @@ #include <dirent.h> #include <errno.h> #include <fcntl.h> -#include <inttypes.h> #include <limits.h> // PATH_MAX #include <poll.h> #include <pwd.h> @@ -32,6 +31,7 @@ #include <unistd.h> #include <cassert> +#include <cinttypes> #include "src/main/cpp/blaze_util.h" #include "src/main/cpp/blaze_util_platform.h" diff --git a/src/main/cpp/util/file_platform.h b/src/main/cpp/util/file_platform.h index 0a70c1a39c..b69479d172 100644 --- a/src/main/cpp/util/file_platform.h +++ b/src/main/cpp/util/file_platform.h @@ -15,9 +15,9 @@ #ifndef BAZEL_SRC_MAIN_CPP_UTIL_FILE_PLATFORM_H_ #define BAZEL_SRC_MAIN_CPP_UTIL_FILE_PLATFORM_H_ -#include <stdint.h> #include <time.h> +#include <cinttypes> #include <string> namespace blaze_util { diff --git a/src/main/cpp/util/md5.cc b/src/main/cpp/util/md5.cc index 770378533a..0cb5a864aa 100644 --- a/src/main/cpp/util/md5.cc +++ b/src/main/cpp/util/md5.cc @@ -39,10 +39,11 @@ #include "src/main/cpp/util/md5.h" -#include <stdint.h> #include <string.h> // for memcpy #include <stddef.h> // for ofsetof +#include <cinttypes> + #if !_STRING_ARCH_unaligned # ifdef _LP64 # define UNALIGNED_P(p) (reinterpret_cast<uint64_t>(p) % \ diff --git a/src/main/cpp/util/numbers.cc b/src/main/cpp/util/numbers.cc index b0ac3980a4..d1ae88b9ff 100644 --- a/src/main/cpp/util/numbers.cc +++ b/src/main/cpp/util/numbers.cc @@ -15,8 +15,8 @@ #include <errno.h> // errno, ERANGE #include <limits.h> -#include <stdint.h> #include <cassert> +#include <cinttypes> #include <cstdlib> #include <limits> diff --git a/src/main/cpp/util/port.h b/src/main/cpp/util/port.h index 393648ea04..6cb9823121 100644 --- a/src/main/cpp/util/port.h +++ b/src/main/cpp/util/port.h @@ -15,7 +15,8 @@ #define BAZEL_SRC_MAIN_CPP_UTIL_PORT_H_ #include <stddef.h> // For size_t on Linux, Darwin -#include <stdint.h> // For size_t on Windows + +#include <cinttypes> // For size_t on Windows // GCC-specific features #if (defined(COMPILER_GCC3) || defined(__APPLE__)) && !defined(SWIG) diff --git a/src/tools/singlejar/output_jar.h b/src/tools/singlejar/output_jar.h index 53f69782f5..58ae09150a 100644 --- a/src/tools/singlejar/output_jar.h +++ b/src/tools/singlejar/output_jar.h @@ -15,8 +15,9 @@ #ifndef SRC_TOOLS_SINGLEJAR_COMBINED_JAR_H_ #define SRC_TOOLS_SINGLEJAR_COMBINED_JAR_H_ -#include <stdint.h> #include <stdio.h> + +#include <cinttypes> #include <memory> #include <string> #include <unordered_map> diff --git a/src/tools/singlejar/zip_headers.h b/src/tools/singlejar/zip_headers.h index 9c97691c14..0b3202973a 100644 --- a/src/tools/singlejar/zip_headers.h +++ b/src/tools/singlejar/zip_headers.h @@ -20,10 +20,11 @@ * http://www.pkware.com/documents/casestudies/APPNOTE.TXT */ -#include <stdint.h> #include <stdlib.h> #include <string.h> +#include <cinttypes> + #if defined(__linux__) #include <endian.h> #elif defined(__FreeBSD__) diff --git a/src/tools/singlejar/zlib_interface.h b/src/tools/singlejar/zlib_interface.h index b9bc0c52f6..a07e4df13f 100644 --- a/src/tools/singlejar/zlib_interface.h +++ b/src/tools/singlejar/zlib_interface.h @@ -15,7 +15,7 @@ #ifndef BAZEL_SRC_TOOLS_SINGLEJAR_ZLIB_INTERFACE_H_ #define BAZEL_SRC_TOOLS_SINGLEJAR_ZLIB_INTERFACE_H_ -#include <stdint.h> +#include <cinttypes> #include "src/tools/singlejar/diag.h" #include <zlib.h> |