fix clang3.4 probrems

This commit is contained in:
bolero-MURAKAMI 2013-11-10 19:31:35 +09:00
parent f5e00839c1
commit e03f53f0d2
3 changed files with 4 additions and 3 deletions

View file

@ -699,7 +699,8 @@ namespace sprout {
SPROUT_CXX14_CONSTEXPR word_type& SPROUT_CXX14_CONSTEXPR word_type&
getword(std::size_t) SPROUT_NOEXCEPT { getword(std::size_t) SPROUT_NOEXCEPT {
return throw std::out_of_range("base_bitset::getword"), *new word_type(); typedef word_type* type;
return throw std::out_of_range("base_bitset::getword"), *type();
} }
SPROUT_CONSTEXPR word_type SPROUT_CONSTEXPR word_type
getword(std::size_t) const SPROUT_NOEXCEPT { getword(std::size_t) const SPROUT_NOEXCEPT {

View file

@ -380,7 +380,7 @@ namespace sprout {
}}; }};
} }
SPROUT_CXX14_CONSTEXPR 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);
w[i] |= (block_[i * 4 + 1] << 16); w[i] |= (block_[i * 4 + 1] << 16);

View file

@ -202,7 +202,7 @@ namespace sprout {
SPROUT_CXX14_CONSTEXPR pointer c_array() SPROUT_NOEXCEPT { SPROUT_CXX14_CONSTEXPR pointer c_array() SPROUT_NOEXCEPT {
return &elems[0]; return &elems[0];
} }
SPROUT_CONSTEXPR const_pointer c_array() SPROUT_NOEXCEPT { SPROUT_CONSTEXPR const_pointer c_array() const SPROUT_NOEXCEPT {
return &elems[0]; return &elems[0];
} }
SPROUT_CXX14_CONSTEXPR void assign(const_reference value) { SPROUT_CXX14_CONSTEXPR void assign(const_reference value) {