boostorg/tuple
1
0
Fork 1
mirror of https://github.com/boostorg/tuple.git synced 2025-07-29 12:17:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added support for assignment from std::pair. Test in tuple_test_bench.cpp enabled for MSVC version

Browse Source 
[SVN r11025]
This commit is contained in:
Douglas Gregor
2001-09-05 03:22:31 +00:00
parent d427f6027d
commit 31efdb5485
2 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
include/boost/tuple/detail/tuple_basic_no_partial_spec.hpp
View File

@ -32,6 +32,7 @@
#define BOOST_TUPLE_BASIC_NO_PARTIAL_SPEC_HPP
#include "boost/type_traits.hpp"
#include <utility>
#if defined BOOST_MSVC
#pragma warning(disable:4518) // storage-class or type specifier(s) unexpected here; ignored
@ -86,32 +87,33 @@ namespace boost {
// cons builds a heterogenous list of types
template<typename Head, typename Tail = null_type>
struct cons
{
typedef cons self_type;
typedef Head head_type;
typedef Tail tail_type;
struct cons
{
typedef cons self_type;
typedef Head head_type;
typedef Tail tail_type;
head_type head;
tail_type tail;
head_type head;
tail_type tail;
typename boost::add_reference<head_type>::type get_head() { return head; }
typename boost::add_reference<tail_type>::type get_tail() { return tail; }
typename boost::add_reference<head_type>::type get_head() { return head; }
typename boost::add_reference<tail_type>::type get_tail() { return tail; }
typename boost::add_reference<const head_type>::type get_head() const { return head; }
typename boost::add_reference<const tail_type>::type get_tail() const { return tail; }
typename boost::add_reference<const head_type>::type get_head() const { return head; }
typename boost::add_reference<const tail_type>::type get_tail() const { return tail; }
template<typename Other>
explicit cons(const Other& other) : head(other.head), tail(other.tail)
#if defined BOOST_MSVC
template<typename Tail>
explicit cons(const head_type& h /* = head_type() */, // causes MSVC 6.5 to barf.
const Tail& t) : head(h), tail(t.head, t.tail)
{
}
#if defined BOOST_MSVC
explicit cons(const head_type& h /* = head_type() */, // causes MSVC 6.5 to barf.
const tail_type& t = tail_type()) :
head(h), tail(t)
const null_type& t) : head(h), tail(t)
{
}
#else
explicit cons(const head_type& h = head_type(),
const tail_type& t = tail_type()) :
@ -347,16 +349,26 @@ namespace boost {
{
}
template<typename Other>
explicit tuple(const Other& other) : cons1(other)
template<typename Head, typename Tail>
explicit tuple(const cons<Head, Tail>& other) :
cons1(other.head, other.tail)
{
}
template<typename Other>
self_type& operator=(const Other& other)
template<typename First, typename Second>
self_type& operator=(const std::pair<First, Second>& other)
{
this->head = other.first;
this->tail.head = other.second;
return *this;
}
template<typename Head, typename Tail>
self_type& operator=(const cons<Head, Tail>& other)
{
this->head = other.head;
this->tail = other.tail;
return *this;
}
};

3
test/tuple_test_bench.cpp
View File

@ -244,11 +244,10 @@ void foo4()
// testing tie
// testing assignment from std::pair
void foo7() {
#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
int i, j;
tie (i, j) = std::make_pair(1, 2);
BOOST_TEST(i == 1 && j == 2);
#endif
tuple<int, int, float> a;
#ifdef E11
a = std::make_pair(1, 2); // should fail, tuple is of length 3, not 2