Skip to content

Commit 6b99d20

Browse files
committed
Fix the coding style
Change-Id: I02e8a52935376b4ecc700cd17edaeb871b2bd487
1 parent 1cf378a commit 6b99d20

3 files changed

Lines changed: 10 additions & 11 deletions

File tree

cpp/src/arrow/util/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
# Headers: top level
2323
install(FILES
24-
armce-util.h
2524
bit-stream-utils.h
2625
bit-util.h
2726
bpacking.h
@@ -45,6 +44,7 @@ install(FILES
4544
logging.h
4645
macros.h
4746
memory.h
47+
neon-util.h
4848
parallel.h
4949
rle-encoding.h
5050
sse-util.h

cpp/src/arrow/util/hash-util.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525

2626
#include "arrow/util/logging.h"
2727
#include "arrow/util/macros.h"
28+
#include "arrow/util/neon-util.h"
2829
#include "arrow/util/sse-util.h"
29-
#include "arrow/util/armce-util.h"
3030

3131
static inline uint32_t HW_crc32_u8(uint32_t crc, uint8_t v) {
3232
DCHECK(false) << "Hardware CRC support is not enabled";
@@ -49,12 +49,12 @@ static inline uint32_t HW_crc32_u64(uint32_t crc, uint64_t v) {
4949
}
5050

5151
#ifdef ARROW_HAVE_SSE4_2
52-
#define HW_crc32_u8 SSE4_crc32_u8
52+
#define HW_crc32_u8 SSE4_crc32_u8
5353
#define HW_crc32_u16 SSE4_crc32_u16
5454
#define HW_crc32_u32 SSE4_crc32_u32
5555
#define HW_crc32_u64 SSE4_crc32_u64
5656
#elif defined(ARROW_HAVE_ARM_CRC)
57-
#define HW_crc32_u8 ARMCE_crc32_u8
57+
#define HW_crc32_u8 ARMCE_crc32_u8
5858
#define HW_crc32_u16 ARMCE_crc32_u16
5959
#define HW_crc32_u32 ARMCE_crc32_u32
6060
#define HW_crc32_u64 ARMCE_crc32_u64
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
#ifndef ARROW_UTIL_ARMCE_UTIL_H
19-
#define ARROW_UTIL_ARMCE_UTIL_H
18+
#ifndef ARROW_UTIL_NEON_UTIL_H
19+
#define ARROW_UTIL_NEON_UTIL_H
2020

2121
namespace arrow {
2222

@@ -29,14 +29,13 @@ namespace arrow {
2929

3030
#if defined(__GNUC__) && defined(__linux__) && defined(ARROW_HAVE_ARM_CRC)
3131

32-
#include <sys/auxv.h>
3332
#include <asm/hwcap.h>
33+
#include <sys/auxv.h>
3434
#ifndef HWCAP_CRC32
3535
#define HWCAP_CRC32 (1 << 7)
3636
#endif
37-
static inline uint32_t crc32c_runtime_check(void)
38-
{
39-
unsigned long auxv = getauxval(AT_HWCAP);
37+
static inline uint32_t crc32c_runtime_check(void) {
38+
uint64_t auxv = getauxval(AT_HWCAP);
4039
return (auxv & HWCAP_CRC32) != 0;
4140
}
4241

@@ -87,4 +86,4 @@ static inline uint32_t ARMCE_crc32_u64(uint32_t, uint64_t) {
8786

8887
} // namespace arrow
8988

90-
#endif // ARROW_UTIL_ARMCE_UTIL_H
89+
#endif // ARROW_UTIL_NEON_UTIL_H

0 commit comments

Comments
 (0)