Merge pull request #743 from redboltz/fix_741

Fixed #741.

Author: redboltz

erb/v1/cpp03_msgpack_tuple.hpp.erb

@@ -121,7 +121,7 @@ inline tuple<> make_tuple()
 /// @cond
 <%0.upto(GENERATION_LIMIT) {|i|%>
 template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
-inline tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_tuple(typename tuple_type<A0>::transparent_reference a0<%1.upto(i) {|j|%>, typename tuple_type<A<%=j%>>::transparent_reference a<%=j%><%}%>)
+tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_tuple(A0 const& a0<%1.upto(i) {|j|%>, A<%=j%> const& a<%=j%><%}%>)
 {
     return tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>(a0<%1.upto(i) {|j|%>, a<%=j%><%}%>);
 }

erb/v1/cpp03_msgpack_tuple_decl.hpp.erb

@@ -54,7 +54,7 @@ tuple<> make_tuple();
 /// @cond
 <%0.upto(GENERATION_LIMIT) {|i|%>
 template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
-tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_tuple(typename tuple_type<A0>::transparent_reference a0<%1.upto(i) {|j|%>, typename tuple_type<A<%=j%>>::transparent_reference a<%=j%><%}%>);
+tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_tuple(A0 const& a0<%1.upto(i) {|j|%>, A<%=j%> const& a<%=j%><%}%>);
 <%}%>
 /// @endcond
 

include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple.hpp

@@ -53,7 +53,7 @@ struct MsgpackTuplePacker {
         msgpack::packer<Stream>& o,
         const Tuple& v) {
         MsgpackTuplePacker<Stream, Tuple, N-1>::pack(o, v);
-        o.pack(type::get<N-1>(v));
+        o.pack(v.template get<N-1>());
     }
 };
 
@@ -62,7 +62,7 @@ struct MsgpackTuplePacker<Stream, Tuple, 1> {
     static void pack (
         msgpack::packer<Stream>& o,
         const Tuple& v) {
-        o.pack(type::get<0>(v));
+        o.pack(v.template get<0>());
     }
 };
 
@@ -122,7 +122,7 @@ struct MsgpackTupleConverter {
         Tuple& v) {
         MsgpackTupleConverter<Tuple, N-1>::convert(o, v);
         if (o.via.array.size >= N)
-            o.via.array.ptr[N-1].convert<typename std::remove_reference<decltype(type::get<N-1>(v))>::type>(type::get<N-1>(v));
+            o.via.array.ptr[N-1].convert<typename std::remove_reference<decltype(v.template get<N-1>())>::type>(v.template get<N-1>());
     }
 };
 
@@ -131,7 +131,7 @@ struct MsgpackTupleConverter<Tuple, 1> {
     static void convert (
         msgpack::object const& o,
         Tuple& v) {
-        o.via.array.ptr[0].convert<typename std::remove_reference<decltype(type::get<0>(v))>::type>(type::get<0>(v));
+        o.via.array.ptr[0].convert<typename std::remove_reference<decltype(v.template get<0>())>::type>(v.template get<0>());
     }
 };
 
@@ -174,7 +174,7 @@ struct MsgpackTupleToObjectWithZone {
         msgpack::object::with_zone& o,
         const Tuple& v) {
         MsgpackTupleToObjectWithZone<Tuple, N-1>::convert(o, v);
-        o.via.array.ptr[N-1] = msgpack::object(type::get<N-1>(v), o.zone);
+        o.via.array.ptr[N-1] = msgpack::object(v.template get<N-1>(), o.zone);
     }
 };
 
@@ -183,7 +183,7 @@ struct MsgpackTupleToObjectWithZone<Tuple, 1> {
     static void convert (
         msgpack::object::with_zone& o,
         const Tuple& v) {
-        o.via.array.ptr[0] = msgpack::object(type::get<0>(v), o.zone);
+        o.via.array.ptr[0] = msgpack::object(v.template get<0>(), o.zone);
     }
 };
 

include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple_decl.hpp

@@ -31,7 +31,7 @@ namespace type {
     using std::ignore;
     using std::swap;
 
-    template< class... Types >
+    template <class... Types>
     class tuple : public std::tuple<Types...> {
     public:
         using base = std::tuple<Types...>;
@@ -61,17 +61,17 @@ namespace type {
             return *this;
         }
 
-        template< std::size_t I>
-        typename tuple_element<I, base >::type&
-        get() & { return std::get<I>(*this); }
+        template<std::size_t I>
+        typename tuple_element<I, base>::type&
+        get() & noexcept { return std::get<I>(static_cast<base&>(*this)); }
 
-        template< std::size_t I>
-        typename tuple_element<I, base >::type const&
-        get() const& { return std::get<I>(*this); }
+        template<std::size_t I>
+        typename tuple_element<I, base>::type const&
+        get() const& noexcept { return std::get<I>(static_cast<base const&>(*this)); }
 
-        template< std::size_t I>
-        typename tuple_element<I, base >::type&&
-        get() && { return std::get<I>(*this); }
+        template<std::size_t I>
+        typename tuple_element<I, base>::type&&
+        get() && noexcept { return std::get<I>(static_cast<base&&>(*this)); }
 
         std::size_t size() const { return sizeof...(Types); }
     };

include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple.hpp

@@ -528,6 +528,18 @@ TEST(MSGPACK_TUPLE, simple_tuple_less_than_convert)
     EXPECT_EQ(val1.get<1>(), val2.get<1>());
 }
 
+TEST(MSGPACK_TUPLE, simple_tuple_nest)
+{
+    msgpack::sbuffer sbuf;
+    msgpack::type::tuple<msgpack::type::tuple<> > val1;
+    msgpack::pack(sbuf, val1);
+    msgpack::object_handle oh =
+        msgpack::unpack(sbuf.data(), sbuf.size());
+    msgpack::type::tuple<msgpack::type::tuple<> > val2;
+    oh.get().convert(val2);
+    EXPECT_EQ(oh.get().via.array.size, 1u);
+}
+
 // TR1
 
 #if defined(MSGPACK_HAS_STD_TR1_UNORDERED_MAP) || defined(MSGPACK_HAS_STD_TR1_UNORDERED_SET)