Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r53301 - trunk/libs/multi_index/test
From: joaquin_at_[hidden]
Date: 2009-05-27 08:26:44


Author: joaquin
Date: 2009-05-27 08:26:43 EDT (Wed, 27 May 2009)
New Revision: 53301
URL: http://svn.boost.org/trac/boost/changeset/53301

Log:
added qualifier to solve ambiguity with std::make_tuple
Text files modified:
   trunk/libs/multi_index/test/test_composite_key.cpp | 8 +++++---
   1 files changed, 5 insertions(+), 3 deletions(-)

Modified: trunk/libs/multi_index/test/test_composite_key.cpp
==============================================================================
--- trunk/libs/multi_index/test/test_composite_key.cpp (original)
+++ trunk/libs/multi_index/test/test_composite_key.cpp 2009-05-27 08:26:43 EDT (Wed, 27 May 2009)
@@ -1,6 +1,6 @@
 /* Boost.MultiIndex test for composite_key.
  *
- * Copyright 2003-2008 Joaquin M Lopez Munoz.
+ * Copyright 2003-2009 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -637,9 +637,11 @@
   ch4=ch2; /* prevent unused var */
 
   BOOST_CHECK(
- ch1(ck6(xystr(0,0,"hello")))==ch1(make_tuple(std::string("hello"),0,0)));
+ ch1(ck6(xystr(0,0,"hello")))==
+ ch1(boost::make_tuple(std::string("hello"),0,0)));
   BOOST_CHECK(
- ch1(ck6(xystr(4,5,"world")))==ch1(make_tuple(std::string("world"),4,5)));
+ ch1(ck6(xystr(4,5,"world")))==
+ ch1(boost::make_tuple(std::string("world"),4,5)));
 
   typedef boost::hash<composite_key_result<ckey_t3> > ckeyres_hash_t;
 


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk