King_DuckZ/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout synced 2025-08-03 12:49:50 +00:00
Code Issues Releases Wiki Activity

support for VC++2015

Browse source
This commit is contained in:
bolero-MURAKAMI 2015-12-09 19:54:35 +09:00
parent f2c09dd3af
commit b9440c0e9c
33 changed files with 353 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sprout/bitset/bitset.hpp
View file

@ -13,6 +13,7 @@
#include <stdexcept>
#include <type_traits>
#include <sprout/config.hpp>
#include <sprout/assert.hpp>
#include <sprout/workaround/std/cstddef.hpp>
#include <sprout/detail/sizeof.hpp>
#include <sprout/detail/char_literal.hpp>
@ -519,7 +520,7 @@ namespace sprout {
{}
base_bitset(base_bitset<1> const&) = default;
SPROUT_CONSTEXPR base_bitset(unsigned long long val) SPROUT_NOEXCEPT
: w_(val)
: w_(static_cast<word_type>(val))
{}
SPROUT_CONSTEXPR base_bitset(sprout::detail::base_bitset_from_words_construct_tag, word_type word)
: w_(word)
@ -728,8 +729,8 @@ namespace sprout {
SPROUT_CXX14_CONSTEXPR word_type
getword(size_type, bool c = false) SPROUT_NOEXCEPT {
return !c ? 0
: throw std::out_of_range("base_bitset::getword")
return SPROUT_ASSERT_MSG(!c, "base_bitset::getword"),
0
;
}
SPROUT_CONSTEXPR word_type