[Boost-commit] svn:boost r62621 - in trunk: boost/function libs/function/test

Subject: [Boost-commit] svn:boost r62621 - in trunk: boost/function libs/function/test
From: jewillco_at_[hidden]
Date: 2010-06-08 20:47:52

Author: jewillco
Date: 2010-06-08 20:47:51 EDT (Tue, 08 Jun 2010)
New Revision: 62621
URL: http://svn.boost.org/trac/boost/changeset/62621

Log:
Applied patch from #3618; fixes #3618
Text files modified: 
   trunk/boost/function/function_base.hpp |     8 ++++++--                                
   trunk/libs/function/test/Jamfile.v2    |     1 +                                       
   2 files changed, 7 insertions(+), 2 deletions(-)

Modified: trunk/boost/function/function_base.hpp
==============================================================================
--- trunk/boost/function/function_base.hpp	(original)
+++ trunk/boost/function/function_base.hpp	2010-06-08 20:47:51 EDT (Tue, 08 Jun 2010)
@@ -318,11 +318,15 @@
             new (reinterpret_cast<void*>(&out_buffer.data)) functor_type(*in_functor);
 
             if (op == move_functor_tag) {
-              reinterpret_cast<functor_type*>(&in_buffer.data)->~Functor();
+              functor_type* f = reinterpret_cast<functor_type*>(&in_buffer.data);
+              (void)f; // suppress warning about the value of f not being used (MSVC)
+              f->~Functor();
             }
           } else if (op == destroy_functor_tag) {
             // Some compilers (Borland, vc6, ...) are unhappy with ~functor_type.
-            reinterpret_cast<functor_type*>(&out_buffer.data)->~Functor();
+             functor_type* f = reinterpret_cast<functor_type*>(&out_buffer.data);
+             (void)f; // suppress warning about the value of f not being used (MSVC)
+             f->~Functor();
           } else if (op == check_functor_type_tag) {
             const detail::sp_typeinfo& check_type 
               = *out_buffer.type.type;

Modified: trunk/libs/function/test/Jamfile.v2
==============================================================================
--- trunk/libs/function/test/Jamfile.v2	(original)
+++ trunk/libs/function/test/Jamfile.v2	2010-06-08 20:47:51 EDT (Tue, 08 Jun 2010)
@@ -8,6 +8,7 @@
 # For more information, see http://www.boost.org/
 
 project
+    : requirements <toolset>msvc:<asynch-exceptions>on
     : source-location $(BOOST_ROOT)
     ;