Merge [61574], [61575], [61579] to release.

[SVN r62243]
2010-05-26 17:25:06 +00:00
parent 697f338510
commit 1f50e3abe4
3 changed files with 52 additions and 53 deletions
--- a/test/make_shared_perfect_forwarding_test.cpp
+++ b/test/make_shared_perfect_forwarding_test.cpp
@@ -12,14 +12,14 @@
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>

-#ifndef BOOST_HAS_RVALUE_REFS
+#if !defined( BOOST_HAS_RVALUE_REFS ) || !defined( BOOST_HAS_VARIADIC_TMPL )

 int main()
 {
    return 0;
 }

-#else // BOOST_HAS_RVALUE_REFS
+#else // BOOST_HAS_RVALUE_REFS, BOOST_HAS_VARIADIC_TMPL

 class myarg
 {