Reorder platform-specific #include directives after the others This keeps includes together when they are cleaned up. PiperOrigin-RevId: 968679267 Change-Id: Ib3541003fb438e47653b3007ddd5a04b96c3b1a1
diff --git a/absl/crc/internal/crc32_x86_arm_combined_simd.h b/absl/crc/internal/crc32_x86_arm_combined_simd.h index 9c287b5..c50a301 100644 --- a/absl/crc/internal/crc32_x86_arm_combined_simd.h +++ b/absl/crc/internal/crc32_x86_arm_combined_simd.h
@@ -20,6 +20,10 @@ #include "absl/base/config.h" +#ifdef __SSE4_2__ +#include <immintrin.h> +#endif + // ------------------------------------------------------------------------- // Many x86 and ARM machines have CRC acceleration hardware. // We can do a faster version of Extend() on such machines.
diff --git a/absl/crc/internal/crc_memcpy_x86_arm_combined.cc b/absl/crc/internal/crc_memcpy_x86_arm_combined.cc index fd3ce60..dac0446 100644 --- a/absl/crc/internal/crc_memcpy_x86_arm_combined.cc +++ b/absl/crc/internal/crc_memcpy_x86_arm_combined.cc
@@ -38,14 +38,6 @@ // using 3 CRCs over fixed-size blocks where the zero-extensions required for // CRC32C::Concat can be precomputed. -#ifdef __SSE4_2__ -#include <immintrin.h> -#endif - -#ifdef _MSC_VER -#include <intrin.h> -#endif - #include <array> #include <cstddef> #include <cstdint>
diff --git a/absl/crc/internal/non_temporal_memcpy.h b/absl/crc/internal/non_temporal_memcpy.h index 5d3e4e3..96eb178 100644 --- a/absl/crc/internal/non_temporal_memcpy.h +++ b/absl/crc/internal/non_temporal_memcpy.h
@@ -15,6 +15,15 @@ #ifndef ABSL_CRC_INTERNAL_NON_TEMPORAL_MEMCPY_H_ #define ABSL_CRC_INTERNAL_NON_TEMPORAL_MEMCPY_H_ +#include <algorithm> +#include <cassert> +#include <cstdint> +#include <cstring> + +#include "absl/base/attributes.h" +#include "absl/base/config.h" +#include "absl/base/optimization.h" + #ifdef _MSC_VER #include <intrin.h> #endif @@ -28,15 +37,6 @@ #include "absl/crc/internal/non_temporal_arm_intrinsics.h" #endif -#include <algorithm> -#include <cassert> -#include <cstdint> -#include <cstring> - -#include "absl/base/attributes.h" -#include "absl/base/config.h" -#include "absl/base/optimization.h" - namespace absl { ABSL_NAMESPACE_BEGIN namespace crc_internal {