mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2024-12-23 21:25:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix static date member in specialized class template

Browse source
This commit is contained in:
bolero-MURAKAMI 2016-03-10 01:07:55 +09:00
parent 8e24d4551c
commit 4e0b3991b1
3 changed files with 62 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
sprout/checksum/md5.hpp
View file

@ -14,6 +14,7 @@
#include <sprout/config.hpp>
#include <sprout/workaround/std/cstddef.hpp>
#include <sprout/array/array.hpp>
#include <sprout/array/make_array.hpp>
#include <sprout/container/functions.hpp>
#include <sprout/iterator/operation.hpp>
#include <sprout/iterator/bytes_iterator.hpp>
@ -95,12 +96,12 @@ namespace sprout {
return sprout::md5_detail::round_x_impl(k[0], k[1], k[2], k[3], x, round_op, xis, ts, ss);
}
template<int N>
template<int N, typename X = void>
struct round_table;
# define SPROUT_MD5_DETAIL_ROUND_TABLE_DEF(N, XIS, TS, SS) \
template<> \
struct round_table<N> { \
template<typename X> \
struct round_table<N, X> { \
public: \
typedef sprout::array<std::size_t, 16> xis_type; \
typedef sprout::array<std::uint32_t, 16> ts_type; \
@ -116,50 +117,53 @@ namespace sprout {
SPROUT_STATIC_CONSTEXPR_DATA_MEMBER_INNER(SS) \
; \
}; \
SPROUT_CONSTEXPR_OR_CONST sprout::md5_detail::round_table<N>::xis_type sprout::md5_detail::round_table<N>::xis \
template<typename X> \
SPROUT_CONSTEXPR_OR_CONST typename sprout::md5_detail::round_table<N, X>::xis_type sprout::md5_detail::round_table<N, X>::xis \
SPROUT_STATIC_CONSTEXPR_DATA_MEMBER_OUTER(XIS) \
; \
SPROUT_CONSTEXPR_OR_CONST sprout::md5_detail::round_table<N>::ts_type sprout::md5_detail::round_table<N>::ts \
template<typename X> \
SPROUT_CONSTEXPR_OR_CONST typename sprout::md5_detail::round_table<N, X>::ts_type sprout::md5_detail::round_table<N, X>::ts \
SPROUT_STATIC_CONSTEXPR_DATA_MEMBER_OUTER(TS) \
; \
SPROUT_CONSTEXPR_OR_CONST sprout::md5_detail::round_table<N>::ss_type sprout::md5_detail::round_table<N>::ss \
template<typename X> \
SPROUT_CONSTEXPR_OR_CONST typename sprout::md5_detail::round_table<N, X>::ss_type sprout::md5_detail::round_table<N, X>::ss \
SPROUT_STATIC_CONSTEXPR_DATA_MEMBER_OUTER(SS)
SPROUT_MD5_DETAIL_ROUND_TABLE_DEF( \
1, \
(xis_type{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}}), \
(ts_type{{ \
sprout::make_array<std::size_t>(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15), \
sprout::make_array<std::uint32_t>( \
0xD76AA478, 0xE8C7B756, 0x242070DB, 0xC1BDCEEE, 0xF57C0FAF, 0x4787C62A, 0xA8304613, 0xFD469501, \
0x698098D8, 0x8B44F7AF, 0xFFFF5BB1, 0x895CD7BE, 0x6B901122, 0xFD987193, 0xA679438E, 0x49B40821 \
}}), \
(ss_type{{7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22}}) \
), \
sprout::make_array<std::uint32_t>(7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22) \
);
SPROUT_MD5_DETAIL_ROUND_TABLE_DEF( \
2, \
(xis_type{{1, 6, 11, 0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12}}), \
(ts_type{{ \
sprout::make_array<std::size_t>(1, 6, 11, 0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12), \
sprout::make_array<std::uint32_t>( \
0xF61E2562, 0xC040B340, 0x265E5A51, 0xE9B6C7AA, 0xD62F105D, 0x02441453, 0xD8A1E681, 0xE7D3FBC8, \
0x21E1CDE6, 0xC33707D6, 0xF4D50D87, 0x455A14ED, 0xA9E3E905, 0xFCEFA3F8, 0x676F02D9, 0x8D2A4C8A \
}}), \
(ss_type{{5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20}}) \
), \
sprout::make_array<std::uint32_t>(5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20) \
);
SPROUT_MD5_DETAIL_ROUND_TABLE_DEF( \
3, \
(xis_type{{5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2}}), \
(ts_type{{ \
sprout::make_array<std::size_t>(5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2), \
sprout::make_array<std::uint32_t>( \
0xFFFA3942, 0x8771F681, 0x6D9D6122, 0xFDE5380C, 0xA4BEEA44, 0x4BDECFA9, 0xF6BB4B60, 0xBEBFBC70, \
0x289B7EC6, 0xEAA127FA, 0xD4EF3085, 0x04881D05, 0xD9D4D039, 0xE6DB99E5, 0x1FA27CF8, 0xC4AC5665 \
}}), \
(ss_type{{4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23}}) \
), \
sprout::make_array<std::uint32_t>(4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23) \
);
SPROUT_MD5_DETAIL_ROUND_TABLE_DEF( \
4, \
(xis_type{{0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9}}), \
(ts_type{{ \
sprout::make_array<std::size_t>(0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9), \
sprout::make_array<std::uint32_t>( \
0xF4292244, 0x432AFF97, 0xAB9423A7, 0xFC93A039, 0x655B59C3, 0x8F0CCC92, 0xFFEFF47D, 0x85845DD1, \
0x6FA87E4F, 0xFE2CE6E0, 0xA3014314, 0x4E0811A1, 0xF7537E82, 0xBD3AF235, 0x2AD7D2BB, 0xEB86D391 \
}}), \
(ss_type{{6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21}}) \
), \
sprout::make_array<std::uint32_t>(6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21) \
);
# undef SPROUT_MD5_DETAIL_ROUND_TABLE_DEF

45
sprout/math/quaternion/quaternion.hpp
View file

@ -17,6 +17,21 @@
#include <sprout/math/quaternion/detail/mul.hpp>
namespace sprout {
namespace detail {
template<typename T, T V>
struct base_static_size {
public:
SPROUT_STATIC_CONSTEXPR T static_size = V;
};
template<typename T, T V>
SPROUT_CONSTEXPR_OR_CONST T sprout::detail::base_static_size<T, V>::static_size;
template<typename Container>
struct inherit_static_size
: public sprout::detail::base_static_size<typename Container::size_type, Container::static_size>
{};
} // namespace detail
namespace math {
#define SPROUT_QUATERNION_ACCESSOR_GENERATOR(type) \
@ -77,7 +92,9 @@ namespace sprout {
// quaternion
//
template<typename T>
class quaternion {
class quaternion
: public sprout::detail::inherit_static_size<sprout::array<T, 4> >
{
private:
typedef sprout::array<T, 4> array_type;
public:
@ -91,8 +108,6 @@ namespace sprout {
typedef typename array_type::const_pointer const_pointer;
typedef typename array_type::reverse_iterator reverse_iterator;
typedef typename array_type::const_reverse_iterator const_reverse_iterator;
public:
SPROUT_STATIC_CONSTEXPR size_type static_size = array_type::static_size;
private:
array_type elems_;
public:
@ -337,8 +352,6 @@ namespace sprout {
return elems_.c_array();
}
};
template<typename T>
SPROUT_CONSTEXPR_OR_CONST typename sprout::math::quaternion<T>::size_type sprout::math::quaternion<T>::static_size;
template<>
class quaternion<float>;
@ -361,8 +374,6 @@ namespace sprout {
typedef typename array_type::const_pointer const_pointer; \
typedef typename array_type::reverse_iterator reverse_iterator; \
typedef typename array_type::const_reverse_iterator const_reverse_iterator; \
public: \
SPROUT_STATIC_CONSTEXPR size_type static_size = array_type::static_size; \
private: \
array_type elems_;
@ -640,11 +651,14 @@ namespace sprout {
return elems_.c_array(); \
}
#define SPROUT_QUATERNION_MEMBER_STATIC_SIZE_SPECIALIZATION_GENERATOR(type) \
SPROUT_CONSTEXPR_OR_CONST typename sprout::math::quaternion<type>::size_type sprout::math::quaternion<type>::static_size;
#define SPROUT_QUATERNION_BASE_STATIC_SIZE_DECL(type) \
public sprout::detail::inherit_static_size<sprout::array<type, 4> >
template<>
class quaternion<float> {
class quaternion<float>
: SPROUT_QUATERNION_BASE_STATIC_SIZE_DECL(float)
{
public:
SPROUT_QUATERNION_MEMBER_TYPE_DATA_GENERATOR(float)
public:
@ -656,10 +670,11 @@ namespace sprout {
SPROUT_QUATERNION_MEMBER_ALGEBRAIC_GENERATOR(float)
SPROUT_QUATERNION_MEMBER_CONTAINER_GENERATOR(float)
};
SPROUT_QUATERNION_MEMBER_STATIC_SIZE_SPECIALIZATION_GENERATOR(float)
template<>
class quaternion<double> {
class quaternion<double>
: SPROUT_QUATERNION_BASE_STATIC_SIZE_DECL(double)
{
public:
SPROUT_QUATERNION_MEMBER_TYPE_DATA_GENERATOR(double)
public:
@ -671,10 +686,11 @@ namespace sprout {
SPROUT_QUATERNION_MEMBER_ALGEBRAIC_GENERATOR(double)
SPROUT_QUATERNION_MEMBER_CONTAINER_GENERATOR(double)
};
SPROUT_QUATERNION_MEMBER_STATIC_SIZE_SPECIALIZATION_GENERATOR(double)
template<>
class quaternion<long double> {
class quaternion<long double>
: SPROUT_QUATERNION_BASE_STATIC_SIZE_DECL(long double)
{
public:
SPROUT_QUATERNION_MEMBER_TYPE_DATA_GENERATOR(long double)
public:
@ -686,7 +702,6 @@ namespace sprout {
SPROUT_QUATERNION_MEMBER_ALGEBRAIC_GENERATOR(long double)
SPROUT_QUATERNION_MEMBER_CONTAINER_GENERATOR(long double)
};
SPROUT_QUATERNION_MEMBER_STATIC_SIZE_SPECIALIZATION_GENERATOR(long double)
SPROUT_CONSTEXPR sprout::math::quaternion<float>::quaternion(sprout::math::quaternion<double> const& a_recopier)
: elems_{{

11
sprout/uuid/detail/table.hpp
View file

@ -22,14 +22,14 @@ namespace sprout {
SPROUT_LITERAL_CHAR_DEF(lbrace, '{');
SPROUT_LITERAL_CHAR_DEF(rbrace, '}');
template<typename Dummy>
template<typename Dummy, typename X = void>
struct values;
# define SPROUT_UUID_TABLE_DEF \
{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 10, 11, 12, 13, 14, 15}}
template<>
struct values<void> {
template<typename X>
struct values<void, X> {
public:
typedef sprout::array<std::uint8_t, 22> table_type;
public:
@ -37,8 +37,9 @@ namespace sprout {
SPROUT_STATIC_CONSTEXPR_DATA_MEMBER_INNER(SPROUT_UUID_TABLE_DEF)
;
};
SPROUT_CONSTEXPR_OR_CONST sprout::uuids::detail::values<void>::table_type
sprout::uuids::detail::values<void>::table
template<typename X>
SPROUT_CONSTEXPR_OR_CONST typename sprout::uuids::detail::values<void, X>::table_type
sprout::uuids::detail::values<void, X>::table
SPROUT_STATIC_CONSTEXPR_DATA_MEMBER_OUTER(SPROUT_UUID_TABLE_DEF)
;