From 572af7499d088a239d37e9dc09e5e7ac45c13d29 Mon Sep 17 00:00:00 2001 From: Adrian Kummerländer Date: Wed, 9 Apr 2014 18:31:44 +0200 Subject: Switched to standard integer types * i.e. replaced uint8_t with std::uint8_t contained within the standard namespace ** as this version of the types is defined by the standard this should offer better compiler independence and standard compliance * removed unnecessary pointer and reference type arguments in the std::iterator template specializations the CodepointIterator class is derived from --- src/utility.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/utility.h') diff --git a/src/utility.h b/src/utility.h index dcdcf75..e185e3e 100644 --- a/src/utility.h +++ b/src/utility.h @@ -6,22 +6,22 @@ namespace UTF8 { namespace dtl { -enum class CodeUnitType : uint8_t { +enum class CodeUnitType : std::uint8_t { CONTINUATION = (128 >> 0), // 10000000 LEADING = (128 >> 1), // 01000000 THREE = (128 >> 2), // 00100000 FOUR = (128 >> 3), // 00010000 }; -enum class CodePoint : uint8_t { +enum class CodePoint : std::uint8_t { CONTINUATION = (UINT8_MAX >> 2), // 00111111 TWO = (UINT8_MAX >> 3), // 00011111 THREE = (UINT8_MAX >> 4), // 00001111 FOUR = (UINT8_MAX >> 5), // 00000111 }; -bool match(const uint8_t&, CodeUnitType&&); -void write(char32_t&, const uint8_t&, CodePoint&&, const uint8_t&); +bool match(const std::uint8_t&, CodeUnitType&&); +void write(char32_t&, const std::uint8_t&, CodePoint&&, const std::uint8_t&); } } -- cgit v1.2.3