fix uuid/string_generator.hpp

This commit is contained in:
bolero-MURAKAMI 2012-08-10 12:39:03 +09:00
parent e15e8f123e
commit d6a01cd831
10 changed files with 8 additions and 16 deletions

View file

@ -24,7 +24,7 @@ namespace sprout {
struct private_type_ { struct private_type_ {
public: public:
SPROUT_CONSTEXPR private_type_ operator,(int) const; //!!! SPROUT_CONSTEXPR private_type_ operator,(int) const; //???
}; };
template<typename T> template<typename T>

View file

@ -55,7 +55,7 @@ namespace sprout {
reflect_dir, reflect_dir,
std::numeric_limits<typename sprout::darkroom::access::unit<Direction>::type>::epsilon() * 256 std::numeric_limits<typename sprout::darkroom::access::unit<Direction>::type>::epsilon() * 256
) )
// !!! // ???
// sprout::darkroom::coords::scale( // sprout::darkroom::coords::scale(
// sprout::darkroom::intersects::normal(inter), // sprout::darkroom::intersects::normal(inter),
// std::numeric_limits<typename sprout::darkroom::access::unit<Direction>::type>::epsilon() * 256 // std::numeric_limits<typename sprout::darkroom::access::unit<Direction>::type>::epsilon() * 256

View file

@ -157,7 +157,7 @@ namespace sprout {
public: public:
template<typename CVRef, typename Tuple> template<typename CVRef, typename Tuple>
SPROUT_CONSTEXPR result_type operator()(CVRef& arg, Tuple&) const volatile { SPROUT_CONSTEXPR result_type operator()(CVRef& arg, Tuple&) const volatile {
// !!! // ???
//return arg.get(); //return arg.get();
return const_cast<typename std::remove_volatile<typename std::remove_reference<CVRef>::type>::type&>(arg).get(); return const_cast<typename std::remove_volatile<typename std::remove_reference<CVRef>::type>::type&>(arg).get();
} }

View file

@ -35,8 +35,6 @@ namespace sprout {
iterator_type deref_tmp; iterator_type deref_tmp;
public: public:
reverse_iterator() = default; reverse_iterator() = default;
// !!!
//reverse_iterator(reverse_iterator const&) = default;
SPROUT_CONSTEXPR reverse_iterator(reverse_iterator const& other) SPROUT_CONSTEXPR reverse_iterator(reverse_iterator const& other)
: current(other.current) : current(other.current)
, deref_tmp(other.deref_tmp) , deref_tmp(other.deref_tmp)

View file

@ -26,7 +26,6 @@ namespace sprout {
private: private:
base_type rng_; base_type rng_;
public: public:
//uniform_int_float = default; // ???
SPROUT_CONSTEXPR uniform_int_float() SPROUT_CONSTEXPR uniform_int_float()
: rng_() : rng_()
{} {}

View file

@ -46,7 +46,6 @@ namespace sprout {
random_result_type random_; random_result_type random_;
difference_type count_; difference_type count_;
public: public:
//random_iterator() = default; // ???
SPROUT_CONSTEXPR random_iterator() SPROUT_CONSTEXPR random_iterator()
: random_() : random_()
, count_() , count_()
@ -166,7 +165,6 @@ namespace sprout {
random_result_type random_; random_result_type random_;
difference_type count_; difference_type count_;
public: public:
//random_iterator() = default; // ???
SPROUT_CONSTEXPR random_iterator() SPROUT_CONSTEXPR random_iterator()
: random_() : random_()
, count_() , count_()

View file

@ -53,7 +53,6 @@ namespace sprout {
engine_type engine_; engine_type engine_;
distribution_type distribution_; distribution_type distribution_;
public: public:
//random_result() = default; // ???
SPROUT_CONSTEXPR random_result() SPROUT_CONSTEXPR random_result()
: result_() : result_()
, engine_() , engine_()
@ -165,7 +164,6 @@ namespace sprout {
result_type result_; result_type result_;
engine_type engine_; engine_type engine_;
public: public:
//random_result() = default; // ???
SPROUT_CONSTEXPR random_result() SPROUT_CONSTEXPR random_result()
: result_() : result_()
, engine_() , engine_()

View file

@ -15,7 +15,7 @@ namespace sprout {
namespace detail { namespace detail {
template<std::size_t Index, typename Head, bool IsEmpty> template<std::size_t Index, typename Head, bool IsEmpty>
class head_base; class head_base;
//!!! //???
// EBO disabled // EBO disabled
// template<std::size_t Index, typename Head> // template<std::size_t Index, typename Head>
// class head_base<Index, Head, true> // class head_base<Index, Head, true>

View file

@ -69,7 +69,7 @@ namespace sprout {
std::size_t Align = std::alignment_of<typename std::aligned_storage<Len>::type>::value std::size_t Align = std::alignment_of<typename std::aligned_storage<Len>::type>::value
> >
using aligned_storage_ = typename std::aligned_storage<Len, Align>::type; using aligned_storage_ = typename std::aligned_storage<Len, Align>::type;
// !!! // ???
//template<std::size_t Len, typename... Types> //template<std::size_t Len, typename... Types>
//using aligned_union_ = typename std::aligned_union<Len, Types...>::type; //using aligned_union_ = typename std::aligned_union<Len, Types...>::type;
template<typename T> template<typename T>
@ -144,7 +144,7 @@ namespace sprout {
std::size_t Align = std::alignment_of<typename std::aligned_storage<Len>::type>::value std::size_t Align = std::alignment_of<typename std::aligned_storage<Len>::type>::value
> >
using aligned_storage = sprout::aligned_storage_<Len, Align>; using aligned_storage = sprout::aligned_storage_<Len, Align>;
// !!! // ???
//template<std::size_t Len, typename... Types> //template<std::size_t Len, typename... Types>
//using aligned_union = sprout::aligned_union_<Len, Types...>; //using aligned_union = sprout::aligned_union_<Len, Types...>;
template<typename T> template<typename T>
@ -157,7 +157,7 @@ namespace sprout {
using common_type = sprout::common_type_<Types...>; using common_type = sprout::common_type_<Types...>;
template<typename T> template<typename T>
using underlying_type = sprout::underlying_type_<T>; using underlying_type = sprout::underlying_type_<T>;
// !!! // ???
//template<typename F, typename... ArgTypes> //template<typename F, typename... ArgTypes>
//using result_of = sprout::result_of_<F, ArgTypes...>; //using result_of = sprout::result_of_<F, ArgTypes...>;
#endif // #if SPROUT_USE_TEMPLATE_ALIASES #endif // #if SPROUT_USE_TEMPLATE_ALIASES

View file

@ -114,8 +114,7 @@ namespace sprout {
return has_dashes return has_dashes
? is_dash(nc.c) ? is_dash(nc.c)
? generate_2_2(nc.next(), open_brace, has_dashes, args...) ? generate_2_2(nc.next(), open_brace, has_dashes, args...)
//: throw std::domain_error("string_generator: invalid uuid string (dashes not found)") // ??? : throw std::domain_error("string_generator: invalid uuid string (dashes not found)")
: generate_2_2(nc, open_brace, has_dashes, args...)
: generate_2_2(nc, open_brace, has_dashes, args...) : generate_2_2(nc, open_brace, has_dashes, args...)
; ;
} }