Merge [69244] to release. Fixes #4892.

[SVN r70433]
2011-03-22 23:17:51 +00:00
parent 545745d649
commit 445e8d1728
2 changed files with 456 additions and 2 deletions
@@ -12,14 +12,14 @@
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>

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

 int main()
 {
    return 0;
 }

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

 class myarg
 {