Subject: [Boost-commit] svn:boost r80296 - in branches/release: . libs libs/proto/test
From: eric_at_[hidden]
Date: 2012-08-28 22:02:58
Author: eric_niebler
Date: 2012-08-28 22:02:57 EDT (Tue, 28 Aug 2012)
New Revision: 80296
URL: http://svn.boost.org/trac/boost/changeset/80296
Log:
merge [79567] from trunk
Added:
branches/release/libs/proto/test/protect.cpp
- copied unchanged from r79567, /trunk/libs/proto/test/protect.cpp
Properties modified:
branches/release/ (props changed)
branches/release/libs/ (props changed)
Text files modified:
branches/release/libs/proto/test/Jamfile.v2 | 1 +
branches/release/libs/proto/test/pack_expansion.cpp | 4 +++-
2 files changed, 4 insertions(+), 1 deletions(-)
Modified: branches/release/libs/proto/test/Jamfile.v2
==============================================================================
--- branches/release/libs/proto/test/Jamfile.v2 (original)
+++ branches/release/libs/proto/test/Jamfile.v2 2012-08-28 22:02:57 EDT (Tue, 28 Aug 2012)
@@ -38,6 +38,7 @@
[ run mem_ptr.cpp : : : <toolset>msvc:<cxxflags>/wd4355 ]
[ run noinvoke.cpp ]
[ run pack_expansion.cpp ]
+ [ run protect.cpp ]
[ compile bug2407.cpp ]
;
Modified: branches/release/libs/proto/test/pack_expansion.cpp
==============================================================================
--- branches/release/libs/proto/test/pack_expansion.cpp (original)
+++ branches/release/libs/proto/test/pack_expansion.cpp 2012-08-28 22:02:57 EDT (Tue, 28 Aug 2012)
@@ -77,7 +77,9 @@
void test_call_pack()
{
proto::terminal<int>::type i = {42};
- int res = eval1()(i + 2);
+ int res = eval1()(i);
+ BOOST_CHECK_EQUAL(res, 42);
+ res = eval1()(i + 2);
BOOST_CHECK_EQUAL(res, 44);
res = eval1()(i * 2);
BOOST_CHECK_EQUAL(res, 84);