mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-07-14 15:04:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[sprout.checksum] support for C++14 constexpr

Browse source
This commit is contained in:
bolero-MURAKAMI 2013-10-29 17:59:14 +09:00
parent 3f4a24289e
commit 1bce2b4a5b
4 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

18
sprout/checksum/md5.hpp
View file

@ -343,7 +343,7 @@ namespace sprout {
static_cast<std::uint8_t>((k_[3] >> 24) & 0xFF) static_cast<std::uint8_t>((k_[3] >> 24) & 0xFF)
}}; }};
} }
void process_block() { SPROUT_CXX14_CONSTEXPR void process_block() {
sprout::array<std::uint32_t, 4> x = sprout::md5_detail::round_all(k_, block_); sprout::array<std::uint32_t, 4> x = sprout::md5_detail::round_all(k_, block_);
k_[0] += x[0]; k_[0] += x[0];
k_[1] += x[1]; k_[1] += x[1];
@ -352,7 +352,7 @@ namespace sprout {
block_.assign(0); block_.assign(0);
} }
template<typename InputIterator> template<typename InputIterator>
void process_block_impl(InputIterator first, InputIterator last) { SPROUT_CXX14_CONSTEXPR void process_block_impl(InputIterator first, InputIterator last) {
for(; first != last; ++first) { for(; first != last; ++first) {
process_byte(*first); process_byte(*first);
} }
@ -363,7 +363,7 @@ namespace sprout {
, block_{{}} , block_{{}}
, bit_count_() , bit_count_()
{} {}
void reset() { SPROUT_CXX14_CONSTEXPR void reset() {
k_[0] = 0x67452301; k_[0] = 0x67452301;
k_[1] = 0xEFCDAB89; k_[1] = 0xEFCDAB89;
k_[2] = 0x98BADCFE; k_[2] = 0x98BADCFE;
@ -414,7 +414,7 @@ namespace sprout {
return process_block(sprout::begin(bytes_range), sprout::end(bytes_range)); return process_block(sprout::begin(bytes_range), sprout::end(bytes_range));
} }
void process_bit(bool bit) { SPROUT_CXX14_CONSTEXPR void process_bit(bool bit) {
std::size_t index = static_cast<std::size_t>(bit_count_ % (64 * 8) / 32); std::size_t index = static_cast<std::size_t>(bit_count_ % (64 * 8) / 32);
std::size_t offset = static_cast<std::size_t>(bit_count_ % 32); std::size_t offset = static_cast<std::size_t>(bit_count_ % 32);
block_[index] |= static_cast<std::uint32_t>(bit) << (offset / 8 * 8 + (7 - offset % 8)); block_[index] |= static_cast<std::uint32_t>(bit) << (offset / 8 * 8 + (7 - offset % 8));
@ -422,27 +422,27 @@ namespace sprout {
process_block(); process_block();
} }
} }
void process_bits(std::uint8_t bits, std::size_t bit_count) { SPROUT_CXX14_CONSTEXPR void process_bits(std::uint8_t bits, std::size_t bit_count) {
while (bit_count--) { while (bit_count--) {
process_bit(((bits >> bit_count) & 1) != 0); process_bit(((bits >> bit_count) & 1) != 0);
} }
} }
void process_byte(std::uint8_t byte) { SPROUT_CXX14_CONSTEXPR void process_byte(std::uint8_t byte) {
process_bits(byte, 8); process_bits(byte, 8);
} }
template<typename InputIterator> template<typename InputIterator>
void process_block(InputIterator bytes_begin, InputIterator bytes_end) { SPROUT_CXX14_CONSTEXPR void process_block(InputIterator bytes_begin, InputIterator bytes_end) {
process_block_impl( process_block_impl(
sprout::make_bytes_iterator(bytes_begin), sprout::make_bytes_iterator(bytes_begin),
sprout::make_bytes_iterator(bytes_end) sprout::make_bytes_iterator(bytes_end)
); );
} }
template<typename InputIterator> template<typename InputIterator>
void process_bytes(InputIterator buffer, std::size_t byte_count) { SPROUT_CXX14_CONSTEXPR void process_bytes(InputIterator buffer, std::size_t byte_count) {
process_block(buffer, sprout::next(buffer, byte_count)); process_block(buffer, sprout::next(buffer, byte_count));
} }
template<typename InputRange> template<typename InputRange>
void process_range(InputRange const& bytes_range) { SPROUT_CXX14_CONSTEXPR void process_range(InputRange const& bytes_range) {
process_block(sprout::begin(bytes_range), sprout::end(bytes_range)); process_block(sprout::begin(bytes_range), sprout::end(bytes_range));
} }

14
sprout/checksum/sha1.hpp
View file

@ -379,7 +379,7 @@ namespace sprout {
static_cast<std::uint8_t>((h_[4]) & 0xFF) static_cast<std::uint8_t>((h_[4]) & 0xFF)
}}; }};
} }
void process_block() { SPROUT_CXX14_CONSTEXPR void process_block() {
std::uint32_t w[80]; std::uint32_t w[80];
for (std::size_t i = 0; i < 16; ++i) { for (std::size_t i = 0; i < 16; ++i) {
w[i] = (block_[i * 4 + 0] << 24); w[i] = (block_[i * 4 + 0] << 24);
@ -424,7 +424,7 @@ namespace sprout {
h_[3] += d; h_[3] += d;
h_[4] += e; h_[4] += e;
} }
void process_byte_impl(unsigned char byte) { SPROUT_CXX14_CONSTEXPR void process_byte_impl(unsigned char byte) {
block_[block_byte_index_++] = byte; block_[block_byte_index_++] = byte;
if (block_byte_index_ == 64) { if (block_byte_index_ == 64) {
block_byte_index_ = 0; block_byte_index_ = 0;
@ -444,7 +444,7 @@ namespace sprout {
, block_byte_index_() , block_byte_index_()
, bit_count_() , bit_count_()
{} {}
void reset() { SPROUT_CXX14_CONSTEXPR void reset() {
h_[0] = 0x67452301; h_[0] = 0x67452301;
h_[1] = 0xEFCDAB89; h_[1] = 0xEFCDAB89;
h_[2] = 0x98BADCFE; h_[2] = 0x98BADCFE;
@ -478,23 +478,23 @@ namespace sprout {
return process_block(sprout::begin(bytes_range), sprout::end(bytes_range)); return process_block(sprout::begin(bytes_range), sprout::end(bytes_range));
} }
void process_byte(std::uint8_t byte) { SPROUT_CXX14_CONSTEXPR void process_byte(std::uint8_t byte) {
process_byte_impl(byte); process_byte_impl(byte);
bit_count_ += 8; bit_count_ += 8;
} }
template<typename InputIterator> template<typename InputIterator>
void process_block(InputIterator bytes_begin, InputIterator bytes_end) { SPROUT_CXX14_CONSTEXPR void process_block(InputIterator bytes_begin, InputIterator bytes_end) {
process_block_impl( process_block_impl(
sprout::make_bytes_iterator(bytes_begin), sprout::make_bytes_iterator(bytes_begin),
sprout::make_bytes_iterator(bytes_end) sprout::make_bytes_iterator(bytes_end)
); );
} }
template<typename InputIterator> template<typename InputIterator>
void process_bytes(InputIterator buffer, std::size_t byte_count) { SPROUT_CXX14_CONSTEXPR void process_bytes(InputIterator buffer, std::size_t byte_count) {
process_block(buffer, sprout::next(buffer, byte_count)); process_block(buffer, sprout::next(buffer, byte_count));
} }
template<typename InputRange> template<typename InputRange>
void process_range(InputRange const& bytes_range) { SPROUT_CXX14_CONSTEXPR void process_range(InputRange const& bytes_range) {
process_block(sprout::begin(bytes_range), sprout::end(bytes_range)); process_block(sprout::begin(bytes_range), sprout::end(bytes_range));
} }

14
sprout/checksum/sum.hpp
View file

@ -49,12 +49,12 @@ namespace sprout {
); );
} }
public: public:
SPROUT_CONSTEXPR sum_basic() = default; sum_basic() = default;
SPROUT_CONSTEXPR sum_basic(sum_basic const&) = default; sum_basic(sum_basic const&) = default;
explicit SPROUT_CONSTEXPR sum_basic(sum_type sum) explicit SPROUT_CONSTEXPR sum_basic(sum_type sum)
: sum_(sum) : sum_(sum)
{} {}
void reset(sum_type new_sum = 0) { SPROUT_CXX14_CONSTEXPR void reset(sum_type new_sum = 0) {
sum_ = new_sum; sum_ = new_sum;
} }
@ -74,19 +74,19 @@ namespace sprout {
return process_block(sprout::begin(bytes_range), sprout::end(bytes_range)); return process_block(sprout::begin(bytes_range), sprout::end(bytes_range));
} }
void process_byte(std::uint8_t byte) { SPROUT_CXX14_CONSTEXPR void process_byte(std::uint8_t byte) {
sum_ += byte; sum_ += byte;
} }
template<typename InputIterator> template<typename InputIterator>
void process_block(InputIterator bytes_begin, InputIterator bytes_end) { SPROUT_CXX14_CONSTEXPR void process_block(InputIterator bytes_begin, InputIterator bytes_end) {
sum_ = calc_sum(bytes_begin, bytes_end); sum_ = calc_sum(bytes_begin, bytes_end);
} }
template<typename InputIterator> template<typename InputIterator>
void process_bytes(InputIterator buffer, std::size_t byte_count) { SPROUT_CXX14_CONSTEXPR void process_bytes(InputIterator buffer, std::size_t byte_count) {
process_block(buffer, sprout::next(buffer, byte_count)); process_block(buffer, sprout::next(buffer, byte_count));
} }
template<typename InputRange> template<typename InputRange>
void process_range(InputRange const& bytes_range) { SPROUT_CXX14_CONSTEXPR void process_range(InputRange const& bytes_range) {
process_block(sprout::begin(bytes_range), sprout::end(bytes_range)); process_block(sprout::begin(bytes_range), sprout::end(bytes_range));
} }

10
sprout/checksum/xor.hpp
View file

@ -43,7 +43,7 @@ namespace sprout {
explicit SPROUT_CONSTEXPR xor8(sum_type sum) explicit SPROUT_CONSTEXPR xor8(sum_type sum)
: sum_(sum) : sum_(sum)
{} {}
void reset(sum_type new_sum = 0) { SPROUT_CXX14_CONSTEXPR void reset(sum_type new_sum = 0) {
sum_ = new_sum; sum_ = new_sum;
} }
@ -63,19 +63,19 @@ namespace sprout {
return process_block(sprout::begin(bytes_range), sprout::end(bytes_range)); return process_block(sprout::begin(bytes_range), sprout::end(bytes_range));
} }
void process_byte(std::uint8_t byte) { SPROUT_CXX14_CONSTEXPR void process_byte(std::uint8_t byte) {
sum_ ^= byte; sum_ ^= byte;
} }
template<typename InputIterator> template<typename InputIterator>
void process_block(InputIterator bytes_begin, InputIterator bytes_end) { SPROUT_CXX14_CONSTEXPR void process_block(InputIterator bytes_begin, InputIterator bytes_end) {
sum_ = calc_sum(bytes_begin, bytes_end); sum_ = calc_sum(bytes_begin, bytes_end);
} }
template<typename InputIterator> template<typename InputIterator>
void process_bytes(InputIterator buffer, std::size_t byte_count) { SPROUT_CXX14_CONSTEXPR void process_bytes(InputIterator buffer, std::size_t byte_count) {
process_block(buffer, sprout::next(buffer, byte_count)); process_block(buffer, sprout::next(buffer, byte_count));
} }
template<typename InputRange> template<typename InputRange>
void process_range(InputRange const& bytes_range) { SPROUT_CXX14_CONSTEXPR void process_range(InputRange const& bytes_range) {
process_block(sprout::begin(bytes_range), sprout::end(bytes_range)); process_block(sprout::begin(bytes_range), sprout::end(bytes_range));
} }