From 0c53c040fda55f683bcc1eec9f5690b8062d1376 Mon Sep 17 00:00:00 2001 From: greg Date: Mon, 1 Apr 2019 09:06:52 -0400 Subject: [PATCH] change variable name to respect standard reserved identifiers (issue #1) --- parallel_hashmap/phmap.h | 64 ++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/parallel_hashmap/phmap.h b/parallel_hashmap/phmap.h index 9bf5aa0..13a057a 100644 --- a/parallel_hashmap/phmap.h +++ b/parallel_hashmap/phmap.h @@ -87,19 +87,19 @@ inline size_t phmap_mix_64(uint64_t a) template struct Hash { - inline size_t operator()(const T& __v) const + inline size_t operator()(const T& val) const { // we mix for safety in case std::hash broken. - return phmap_mix_64(std::hash()(__v)); + return phmap_mix_64(std::hash()(val)); } }; template struct Hash { - inline size_t operator()(const T *__v) const noexcept + inline size_t operator()(const T *val) const noexcept { - return phmap_mix_64(static_cast(__v)); + return phmap_mix_64(static_cast(val)); } }; @@ -113,99 +113,99 @@ struct phmap_unary_function template <> struct Hash : public phmap_unary_function { - inline size_t operator()(bool __v) const noexcept - { return static_cast(__v); } + inline size_t operator()(bool val) const noexcept + { return static_cast(val); } }; template <> struct Hash : public phmap_unary_function { - inline size_t operator()(char __v) const noexcept - { return static_cast(__v); } + inline size_t operator()(char val) const noexcept + { return static_cast(val); } }; template <> struct Hash : public phmap_unary_function { - inline size_t operator()(signed char __v) const noexcept - { return static_cast(__v); } + inline size_t operator()(signed char val) const noexcept + { return static_cast(val); } }; template <> struct Hash : public phmap_unary_function { - inline size_t operator()(unsigned char __v) const noexcept - { return static_cast(__v); } + inline size_t operator()(unsigned char val) const noexcept + { return static_cast(val); } }; template <> struct Hash : public phmap_unary_function { - inline size_t operator()(wchar_t __v) const noexcept - { return static_cast(__v); } + inline size_t operator()(wchar_t val) const noexcept + { return static_cast(val); } }; template <> struct Hash : public phmap_unary_function { - inline size_t operator()(int16_t __v) const noexcept - { return phmap_mix_64(static_cast(__v)); } + inline size_t operator()(int16_t val) const noexcept + { return phmap_mix_64(static_cast(val)); } }; template <> struct Hash : public phmap_unary_function { - inline size_t operator()(uint16_t __v) const noexcept - { return phmap_mix_64(static_cast(__v)); } + inline size_t operator()(uint16_t val) const noexcept + { return phmap_mix_64(static_cast(val)); } }; template <> struct Hash : public phmap_unary_function { - inline size_t operator()(int32_t __v) const noexcept - { return phmap_mix_64(static_cast(__v)); } + inline size_t operator()(int32_t val) const noexcept + { return phmap_mix_64(static_cast(val)); } }; template <> struct Hash : public phmap_unary_function { - inline size_t operator()(uint32_t __v) const noexcept - { return phmap_mix_64(static_cast(__v)); } + inline size_t operator()(uint32_t val) const noexcept + { return phmap_mix_64(static_cast(val)); } }; template <> struct Hash : public phmap_unary_function { - inline size_t operator()(int64_t __v) const noexcept - { return phmap_mix_64(static_cast(__v)); } + inline size_t operator()(int64_t val) const noexcept + { return phmap_mix_64(static_cast(val)); } }; template <> struct Hash : public phmap_unary_function { - inline size_t operator()(uint64_t __v) const noexcept - { return phmap_mix_64(static_cast(__v)); } + inline size_t operator()(uint64_t val) const noexcept + { return phmap_mix_64(static_cast(val)); } }; template <> struct Hash : public phmap_unary_function { - inline size_t operator()(float __v) const noexcept + inline size_t operator()(float val) const noexcept { // -0.0 and 0.0 should return same hash - uint32_t *as_int = reinterpret_cast(&__v); - return (__v == 0) ? static_cast(0) : phmap_mix_64(*as_int); + uint32_t *as_int = reinterpret_cast(&val); + return (val == 0) ? static_cast(0) : phmap_mix_64(*as_int); } }; template <> struct Hash : public phmap_unary_function { - inline size_t operator()(double __v) const noexcept + inline size_t operator()(double val) const noexcept { // -0.0 and 0.0 should return same hash - uint64_t *as_int = reinterpret_cast(&__v); - return (__v == 0) ? static_cast(0) : phmap_mix_64(*as_int); + uint64_t *as_int = reinterpret_cast(&val); + return (val == 0) ? static_cast(0) : phmap_mix_64(*as_int); } };