tuple4_10.hpp Support

diff --git a/roast/include/roast/tp/tuple/tuple4/tuple4.hpp b/roast/include/roast/tp/tuple/tuple4/tuple4.hpp
index 6b29a6e..1ecf0f4 100644 (file)
--- a/roast/include/roast/tp/tuple/tuple4/tuple4.hpp
+++ b/roast/include/roast/tp/tuple/tuple4/tuple4.hpp
@@ -77,5 +77,6 @@ namespace roast
 }
 
 #include "roast/tp/tuple/tuple4/tuple4_31.hpp"
+#include "roast/tp/tuple/tuple4/tuple4_10.hpp"
 
 #endif//__SFJP_ROAST__tp__tuple__tuple4__tuple4_HPP__

diff --git a/roast/include/roast/tp/tuple/tuple4/tuple4_10.hpp b/roast/include/roast/tp/tuple/tuple4/tuple4_10.hpp
index e91d717..1443632 100644 (file)
--- a/roast/include/roast/tp/tuple/tuple4/tuple4_10.hpp
+++ b/roast/include/roast/tp/tuple/tuple4/tuple4_10.hpp
@@ -5,76 +5,52 @@
 #ifndef __SFJP_ROAST__tp__tuple__tuple4__tuple4_10_HPP__
 #define __SFJP_ROAST__tp__tuple__tuple4__tuple4_10_HPP__
 
-#include "roast/tp/tuple_to_nest_type.hpp"
-
 namespace roast
 {
-       //////////////////////////////////////////////////////////////////////////////////
-
-       //      tuple
-       template <
-               typename T0=EmptyType,
-               typename T1=EmptyType,
-               typename T2=EmptyType,
-               typename T3=EmptyType,
-               typename T4=EmptyType,
-               typename T5=EmptyType,
-               typename T6=EmptyType,
-               typename T7=EmptyType,
-               typename T8=EmptyType,
-               typename T9=EmptyType,
-               typename T10=EmptyType,
-               typename T11=EmptyType,
-               typename T12=EmptyType,
-               typename T13=EmptyType,
-               typename T14=EmptyType,
-               typename T15=EmptyType,
-               typename T16=EmptyType,
-               typename T17=EmptyType,
-               typename T18=EmptyType,
-               typename T19=EmptyType,
-               typename T20=EmptyType,
-               typename T21=EmptyType,
-               typename T22=EmptyType,
-               typename T23=EmptyType,
-               typename T24=EmptyType,
-               typename T25=EmptyType,
-               typename T26=EmptyType,
-               typename T27=EmptyType,
-               typename T28=EmptyType,
-               typename T29=EmptyType,
-               typename T30=EmptyType,
-               typename T31=EmptyType,
-               typename T32=EmptyType>
-       class tuple : public tp::_tuple::tuple_to_nest_type<
-               T0,     T1,     T2,     T3,     T4,     T5,     T6,     T7,     T8,     T9,     T10,
-               T11,    T12,    T13,    T14,    T15,    T16,    T17,    T18,    T19,    T20,
-               T21,    T22,    T23,    T24,    T25,    T26,    T27,    T28,    T29,    T30,    T31,    T32>::type
+       namespace tuple4
        {
-       protected:
-               typedef typename tp::_tuple::tuple_to_nest_type<
-                       T0,     T1,     T2,     T3,     T4,     T5,     T6,     T7,     T8,     T9,     T10,
-                       T11,    T12,    T13,    T14,    T15,    T16,    T17,    T18,    T19,    T20,
-                       T21,    T22,    T23,    T24,    T25,    T26,    T27,    T28,    T29,    T30,    T31,    T32>::type
-                       _Base; //, _NestType;
-               typedef typename tuple<
-                       T0,     T1,     T2,     T3,     T4,     T5,     T6,     T7,     T8,     T9,     T10,
-                       T11,    T12,    T13,    T14,    T15,    T16,    T17,    T18,    T19,    T20,
-                       T21,    T22,    T23,    T24,    T25,    T26,    T27,    T28,    T29,    T30,    T31,    T32>
-                       _This, _ThisType;
-       public:
-               typedef _Base _NestType;
-       public:
-               /// Constructors //////////////////////////////////////////////////////////////////
-
-               tuple(){}
-               tuple(const T0 &value_in) : _Base(value_in) {}
-               tuple(const T0 &value_in, const typename _Base::_Next &next_in) : _Base(value_in, next_in) {}
-               tuple(const _NestType &t) : _Base(t) {}
-               tuple(const _ThisType &t) : _Base(t) {}
-       };
-
-       //////////////////////////////////////////////////////////////////////////////////
+               //////////////////////////////////////////////////////////////////////////////////
+       
+               //      tuple
+               template <
+                       typename T0,    typename T1,    typename T2,
+                       typename T3,    typename T4,    typename T5,
+                       typename T6,    typename T7,    typename T8,
+                       typename T9,    typename T10>
+               struct tuple<
+                       T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,
+                       EmptyType,EmptyType,EmptyType,EmptyType,EmptyType,
+                       EmptyType,EmptyType,EmptyType,EmptyType,EmptyType,
+                       EmptyType,EmptyType,EmptyType,EmptyType,EmptyType,
+                       EmptyType,EmptyType,EmptyType,EmptyType,EmptyType>
+               {
+                       /////////////////////////////////////////
+                       //      Values
+                       
+                       T0 t0;          T1 t1;          T2 t2;
+                       T3 t3;          T4 t4;          T5 t5;
+                       T6 t6;          T7 t7;          T8 t8;
+                       T9 t9;          T10 t10;
+                       
+                       /////////////////////////////////////////
+                       //      Constructor
+                       
+                       tuple(){}
+                       tuple(
+                               const T0& t0_,          const T1& t1_,          T2& t2_,
+                               const T3& t3_,          const T4& t4_,          T5& t5_,
+                               const T6& t6_,          const T7& t7_,          T8& t8_,
+                               const T9& t9_,          const T10& t10_
+                       ) :
+                               t0(t0),         t1(t1),         t2(t2), 
+                               t3(t3),         t4(t4),         t5(t5), 
+                               t6(t6),         t7(t7),         t8(t8), 
+                               t9(t9),         t10(t10)
+                       {}
+               };
+       
+               //////////////////////////////////////////////////////////////////////////////////
+       }
 }
 
 #endif//__SFJP_ROAST__tp__tuple__tuple4__tuple4_10_HPP__

diff --git a/roast/test/roast_test_DB_sqlite/sqlite_test2.cpp b/roast/test/roast_test_DB_sqlite/sqlite_test2.cpp
index 0c0c23d..2083688 100644 (file)
--- a/roast/test/roast_test_DB_sqlite/sqlite_test2.cpp
+++ b/roast/test/roast_test_DB_sqlite/sqlite_test2.cpp
@@ -14,9 +14,9 @@ int main()
 {
        try
        {
-               tuple4::tuple<int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int> aaa;
-               aaa.t30=8;
-               printf("%d\n",aaa.t30);
+               tuple4::tuple<int,int,int,int, int,int,int,int,int,int> aaa;
+               aaa.t6=8;
+               printf("%d\n",aaa.t6);
 
                lexical::string str("aaa");
                //printf("%s\n", lexical::to_string2(lexical::seq<lexical::string, lexical::string>(str).c_str() );