fix for ICC: aggregate initialization

This commit is contained in:
bolero-MURAKAMI 2014-02-21 23:43:24 +09:00
parent 1cfea12064
commit eae1729128
11 changed files with 23 additions and 21 deletions

View file

@ -12,6 +12,7 @@
#include <type_traits> #include <type_traits>
#include <sprout/config.hpp> #include <sprout/config.hpp>
#include <sprout/tuple/tuple.hpp> #include <sprout/tuple/tuple.hpp>
#include <sprout/type_traits/identity.hpp>
#include <sprout/type_traits/integral_constant.hpp> #include <sprout/type_traits/integral_constant.hpp>
namespace sprout { namespace sprout {

View file

@ -18,7 +18,7 @@ namespace sprout {
namespace math { namespace math {
namespace detail { namespace detail {
# define SPROUT_BERNOULLI_TABLE_DEF_FLOAT \ # define SPROUT_BERNOULLI_TABLE_DEF_FLOAT \
table_type{{ \ {{ \
1.F, \ 1.F, \
1.F / 6, \ 1.F / 6, \
-1.F / 30, \ -1.F / 30, \
@ -54,7 +54,7 @@ namespace sprout {
-2.09380059113463784091e38F \ -2.09380059113463784091e38F \
}} }}
# define SPROUT_BERNOULLI_TABLE_DEF_DOUBLE \ # define SPROUT_BERNOULLI_TABLE_DEF_DOUBLE \
table_type{{ \ {{ \
1., \ 1., \
1. / 6, \ 1. / 6, \
-1. / 30, \ -1. / 30, \
@ -108,7 +108,7 @@ namespace sprout {
-2.838224957069370695926e78 \ -2.838224957069370695926e78 \
}} }}
# define SPROUT_BERNOULLI_TABLE_DEF_LONG_DOUBLE \ # define SPROUT_BERNOULLI_TABLE_DEF_LONG_DOUBLE \
table_type{{ \ {{ \
1.L, \ 1.L, \
1.L / 6, \ 1.L / 6, \
-1.L / 30, \ -1.L / 30, \

View file

@ -21,7 +21,7 @@ namespace sprout {
namespace math { namespace math {
namespace detail { namespace detail {
# define SPROUT_FACTORIAL_TABLE_DEF_INT_1 \ # define SPROUT_FACTORIAL_TABLE_DEF_INT_1 \
table_type{{ \ {{ \
1, \ 1, \
1, \ 1, \
2, \ 2, \
@ -30,7 +30,7 @@ namespace sprout {
120 \ 120 \
}} }}
# define SPROUT_FACTORIAL_TABLE_DEF_UINT_1 \ # define SPROUT_FACTORIAL_TABLE_DEF_UINT_1 \
table_type{{ \ {{ \
1, \ 1, \
1, \ 1, \
2, \ 2, \
@ -39,7 +39,7 @@ namespace sprout {
120 \ 120 \
}} }}
# define SPROUT_FACTORIAL_TABLE_DEF_INT_2 \ # define SPROUT_FACTORIAL_TABLE_DEF_INT_2 \
table_type{{ \ {{ \
1, \ 1, \
1, \ 1, \
2, \ 2, \
@ -50,7 +50,7 @@ namespace sprout {
5040 \ 5040 \
}} }}
# define SPROUT_FACTORIAL_TABLE_DEF_UINT_2 \ # define SPROUT_FACTORIAL_TABLE_DEF_UINT_2 \
table_type{{ \ {{ \
1, \ 1, \
1, \ 1, \
2, \ 2, \
@ -62,7 +62,7 @@ namespace sprout {
40320 \ 40320 \
}} }}
# define SPROUT_FACTORIAL_TABLE_DEF_INT_4 \ # define SPROUT_FACTORIAL_TABLE_DEF_INT_4 \
table_type{{ \ {{ \
1, \ 1, \
1, \ 1, \
2, \ 2, \
@ -77,7 +77,7 @@ namespace sprout {
39916800 \ 39916800 \
}} }}
# define SPROUT_FACTORIAL_TABLE_DEF_UINT_4 \ # define SPROUT_FACTORIAL_TABLE_DEF_UINT_4 \
table_type{{ \ {{ \
1, \ 1, \
1, \ 1, \
2, \ 2, \
@ -92,7 +92,7 @@ namespace sprout {
39916800 \ 39916800 \
}} }}
# define SPROUT_FACTORIAL_TABLE_DEF_INT_8 \ # define SPROUT_FACTORIAL_TABLE_DEF_INT_8 \
table_type{{ \ {{ \
SPROUT_INT64_C(1), \ SPROUT_INT64_C(1), \
SPROUT_INT64_C(1), \ SPROUT_INT64_C(1), \
SPROUT_INT64_C(2), \ SPROUT_INT64_C(2), \
@ -116,7 +116,7 @@ namespace sprout {
SPROUT_INT64_C(2432902008176640000) \ SPROUT_INT64_C(2432902008176640000) \
}} }}
# define SPROUT_FACTORIAL_TABLE_DEF_UINT_8 \ # define SPROUT_FACTORIAL_TABLE_DEF_UINT_8 \
table_type{{ \ {{ \
SPROUT_UINT64_C(1), \ SPROUT_UINT64_C(1), \
SPROUT_UINT64_C(1), \ SPROUT_UINT64_C(1), \
SPROUT_UINT64_C(2), \ SPROUT_UINT64_C(2), \
@ -140,7 +140,7 @@ namespace sprout {
SPROUT_UINT64_C(2432902008176640000) \ SPROUT_UINT64_C(2432902008176640000) \
}} }}
# define SPROUT_FACTORIAL_TABLE_DEF_FLOAT \ # define SPROUT_FACTORIAL_TABLE_DEF_FLOAT \
table_type{{ \ {{ \
1.0F, \ 1.0F, \
1.0F, \ 1.0F, \
2.0F, \ 2.0F, \
@ -178,7 +178,7 @@ namespace sprout {
0.29523279903960414084761860964352e39F \ 0.29523279903960414084761860964352e39F \
}} }}
# define SPROUT_FACTORIAL_TABLE_DEF_DOUBLE \ # define SPROUT_FACTORIAL_TABLE_DEF_DOUBLE \
table_type{{ \ {{ \
1.0, \ 1.0, \
1.0, \ 1.0, \
2.0, \ 2.0, \
@ -352,7 +352,7 @@ namespace sprout {
0.7257415615307998967396728211129263114717e307 \ 0.7257415615307998967396728211129263114717e307 \
}} }}
# define SPROUT_FACTORIAL_TABLE_DEF_LONG_DOUBLE \ # define SPROUT_FACTORIAL_TABLE_DEF_LONG_DOUBLE \
table_type{{ \ {{ \
1.0L, \ 1.0L, \
1.0L, \ 1.0L, \
2.0L, \ 2.0L, \

View file

@ -30,7 +30,7 @@ namespace sprout {
namespace random { namespace random {
namespace detail { namespace detail {
# define SPROUT_BINOMIAL_TABLE_DEF \ # define SPROUT_BINOMIAL_TABLE_DEF \
table_type{{ \ {{ \
1, \ 1, \
1, \ 1, \
2, \ 2, \

View file

@ -18,8 +18,8 @@
#include <sprout/type/iterator.hpp> #include <sprout/type/iterator.hpp>
#include <sprout/type/iterator/index_iterator.hpp> #include <sprout/type/iterator/index_iterator.hpp>
#include <sprout/type/rebind_types.hpp> #include <sprout/type/rebind_types.hpp>
#include <sprout/type_traits/integral_constant.hpp>
#include <sprout/type_traits/identity.hpp> #include <sprout/type_traits/identity.hpp>
#include <sprout/type_traits/integral_constant.hpp>
namespace sprout { namespace sprout {
namespace types { namespace types {

View file

@ -10,6 +10,7 @@
#include <utility> #include <utility>
#include <sprout/config.hpp> #include <sprout/config.hpp>
#include <sprout/type_traits/identity.hpp>
#include <sprout/type_traits/integral_constant.hpp> #include <sprout/type_traits/integral_constant.hpp>
namespace sprout { namespace sprout {

View file

@ -77,7 +77,7 @@ namespace sprout {
struct values; struct values;
# define SPROUT_UUID_TABLE_DEF \ # define SPROUT_UUID_TABLE_DEF \
table_type{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 10, 11, 12, 13, 14, 15}} {{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 10, 11, 12, 13, 14, 15}}
template<> template<>
struct values<void> { struct values<void> {

View file

@ -72,7 +72,7 @@ namespace sprout {
struct bvalues; struct bvalues;
# define SPROUT_WEED_BDIGITS_TABLE_DEF \ # define SPROUT_WEED_BDIGITS_TABLE_DEF \
table_type{{0, 1}} {{0, 1}}
template<> template<>
struct bvalues<void> { struct bvalues<void> {

View file

@ -72,7 +72,7 @@ namespace sprout {
struct values; struct values;
# define SPROUT_WEED_DIGITS_TABLE_DEF \ # define SPROUT_WEED_DIGITS_TABLE_DEF \
table_type{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}} {{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}}
template<> template<>
struct values<void> { struct values<void> {

View file

@ -72,7 +72,7 @@ namespace sprout {
struct ovalues; struct ovalues;
# define SPROUT_WEED_ODIGITS_TABLE_DEF \ # define SPROUT_WEED_ODIGITS_TABLE_DEF \
table_type{{0, 1, 2, 3, 4, 5, 6, 7}} {{0, 1, 2, 3, 4, 5, 6, 7}}
template<> template<>
struct ovalues<void> { struct ovalues<void> {

View file

@ -72,7 +72,7 @@ namespace sprout {
struct xvalues; struct xvalues;
# define SPROUT_WEED_XDIGITS_TABLE_DEF \ # define SPROUT_WEED_XDIGITS_TABLE_DEF \
table_type{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 10, 11, 12, 13, 14, 15}} {{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 10, 11, 12, 13, 14, 15}}
template<> template<>
struct xvalues<void> { struct xvalues<void> {