[Boost-commit] svn:boost r73855 - in sandbox/stm/branches/vbe/boost/stm: . detail

Subject: [Boost-commit] svn:boost r73855 - in sandbox/stm/branches/vbe/boost/stm: . detail
From: vicente.botet_at_[hidden]
Date: 2011-08-17 16:38:51

Author: viboes
Date: 2011-08-17 16:38:50 EDT (Wed, 17 Aug 2011)
New Revision: 73855
URL: http://svn.boost.org/trac/boost/changeset/73855

Log:
stm: commit some errors on MAC
Text files modified: 
   sandbox/stm/branches/vbe/boost/stm/detail/memory_pool.hpp      |     2 +-                                      
   sandbox/stm/branches/vbe/boost/stm/detail/transaction_impl.hpp |     2 +-                                      
   sandbox/stm/branches/vbe/boost/stm/stm.hpp                     |     2 +-                                      
   3 files changed, 3 insertions(+), 3 deletions(-)

Modified: sandbox/stm/branches/vbe/boost/stm/detail/memory_pool.hpp
==============================================================================
--- sandbox/stm/branches/vbe/boost/stm/detail/memory_pool.hpp	(original)
+++ sandbox/stm/branches/vbe/boost/stm/detail/memory_pool.hpp	2011-08-17 16:38:50 EDT (Wed, 17 Aug 2011)
@@ -17,7 +17,7 @@
 //#define MAP_MEMORY_POOL 1
 
 #include <stdlib.h>
-#include <malloc.h>
+//#include <malloc.h>
 #include <memory.h>
 #include <map>
 #include <vector>

Modified: sandbox/stm/branches/vbe/boost/stm/detail/transaction_impl.hpp
==============================================================================
--- sandbox/stm/branches/vbe/boost/stm/detail/transaction_impl.hpp	(original)
+++ sandbox/stm/branches/vbe/boost/stm/detail/transaction_impl.hpp	2011-08-17 16:38:50 EDT (Wed, 17 Aug 2011)
@@ -1390,7 +1390,7 @@
    // ok, forced to aborts are allowed, do them
    for (std::list<transaction*>::iterator k = aborted.begin(); k != aborted.end();)
    {
-        BOOST_ASSERT(k!=0);
+        BOOST_ASSERT(*k!=0);
       (*k)->force_to_abort();
     BOOST_STM_TRANSACTION_INVARIANT;
 

Modified: sandbox/stm/branches/vbe/boost/stm/stm.hpp
==============================================================================
--- sandbox/stm/branches/vbe/boost/stm/stm.hpp	(original)
+++ sandbox/stm/branches/vbe/boost/stm/stm.hpp	2011-08-17 16:38:50 EDT (Wed, 17 Aug 2011)
@@ -17,7 +17,7 @@
 #include <boost/stm/detail/config.hpp>
 
 #include <boost/stm/base_transaction_object.hpp>
-#include <boost/stm/cache_fct.hpp>
+//#include <boost/stm/cache_fct.hpp>
 #include <boost/stm/datatypes.hpp>
 #include <boost/stm/exceptions.hpp>
 #include <boost/stm/language_like.hpp>