|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r56758 - in sandbox/stm/branches/vbe: boost boost/stm boost/stm/detail boost/stm/non_tx boost/stm/non_tx/detail boost/stm/tx libs/stm/example libs/stm/src
From: vicente.botet_at_[hidden]
Date: 2009-10-12 16:51:06
Author: viboes
Date: 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
New Revision: 56758
URL: http://svn.boost.org/trac/boost/changeset/56758
Log:
TBoost.Stm vbe
* Added language-like macros
Text files modified:
sandbox/stm/branches/vbe/boost/stm.hpp | 22 +---------------------
sandbox/stm/branches/vbe/boost/stm/base_contention_manager.hpp | 2 +-
sandbox/stm/branches/vbe/boost/stm/base_transaction_object.hpp | 2 +-
sandbox/stm/branches/vbe/boost/stm/contention_manager.hpp | 2 +-
sandbox/stm/branches/vbe/boost/stm/detail/config.hpp | 8 ++++----
sandbox/stm/branches/vbe/boost/stm/detail/transaction_impl.hpp | 4 ++--
sandbox/stm/branches/vbe/boost/stm/exceptions.hpp | 2 +-
sandbox/stm/branches/vbe/boost/stm/non_tx/detail/cache_map.hpp | 12 ++++++------
sandbox/stm/branches/vbe/boost/stm/non_tx/smart_ptr.hpp | 8 ++++----
sandbox/stm/branches/vbe/boost/stm/shallow_transaction_object.hpp | 6 +++---
sandbox/stm/branches/vbe/boost/stm/transaction.hpp | 14 +++++++-------
sandbox/stm/branches/vbe/boost/stm/transaction_object.hpp | 12 ++++++------
sandbox/stm/branches/vbe/boost/stm/transaction_object_ptr.hpp | 2 +-
sandbox/stm/branches/vbe/boost/stm/transactional_object.hpp | 6 +++---
sandbox/stm/branches/vbe/boost/stm/tx/numeric.hpp | 2 +-
sandbox/stm/branches/vbe/boost/stm/tx/pointer.hpp | 6 +++---
sandbox/stm/branches/vbe/boost/stm/tx/smart_ptr.hpp | 6 +++---
sandbox/stm/branches/vbe/libs/stm/example/counter_ptr.cpp | 2 +-
sandbox/stm/branches/vbe/libs/stm/example/list.cpp | 2 +-
sandbox/stm/branches/vbe/libs/stm/src/except_and_back_off_on_abort_notice_cm.cpp | 12 ++++++------
sandbox/stm/branches/vbe/libs/stm/src/transaction.cpp | 2 +-
21 files changed, 57 insertions(+), 77 deletions(-)
Modified: sandbox/stm/branches/vbe/boost/stm.hpp
==============================================================================
--- sandbox/stm/branches/vbe/boost/stm.hpp (original)
+++ sandbox/stm/branches/vbe/boost/stm.hpp 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -11,27 +11,6 @@
//
//////////////////////////////////////////////////////////////////////////////
-/* The DRACO Research Group (rogue.colorado.edu/draco) */
-/*****************************************************************************\
- *
- * Copyright Notices/Identification of Licensor(s) of
- * Original Software in the File
- *
- * Copyright 2000-2006 The Board of Trustees of the University of Colorado
- * Contact: Technology Transfer Office,
- * University of Colorado at Boulder;
- * https://www.cu.edu/techtransfer/
- *
- * All rights reserved by the foregoing, respectively.
- *
- * This is licensed software. The software license agreement with
- * the University of Colorado specifies the terms and conditions
- * for use and redistribution.
- *
-\*****************************************************************************/
-
-
-
#ifndef BOOST_STM__HPP
#define BOOST_STM__HPP
@@ -43,6 +22,7 @@
#include <boost/stm/contention_manager.hpp>
#include <boost/stm/datatypes.hpp>
#include <boost/stm/exceptions.hpp>
+#include <boost/stm/language_like.hpp>
#include <boost/stm/move.hpp>
#include <boost/stm/non_tx/numeric.hpp>
#include <boost/stm/non_tx/smart_ptr.hpp>
Modified: sandbox/stm/branches/vbe/boost/stm/base_contention_manager.hpp
==============================================================================
--- sandbox/stm/branches/vbe/boost/stm/base_contention_manager.hpp (original)
+++ sandbox/stm/branches/vbe/boost/stm/base_contention_manager.hpp 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -32,7 +32,7 @@
//-----------------------------------------------------------------------------
class transaction;
class base_transaction_object;
-
+
//-----------------------------------------------------------------------------
class base_contention_manager
{
Modified: sandbox/stm/branches/vbe/boost/stm/base_transaction_object.hpp
==============================================================================
--- sandbox/stm/branches/vbe/boost/stm/base_transaction_object.hpp (original)
+++ sandbox/stm/branches/vbe/boost/stm/base_transaction_object.hpp 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -36,7 +36,7 @@
// forward declarations
//-----------------------------------------------------------------------------
class transaction;
-
+
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// this is the base class of all the transactional objects.
Modified: sandbox/stm/branches/vbe/boost/stm/contention_manager.hpp
==============================================================================
--- sandbox/stm/branches/vbe/boost/stm/contention_manager.hpp (original)
+++ sandbox/stm/branches/vbe/boost/stm/contention_manager.hpp 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -18,7 +18,7 @@
namespace boost { namespace stm {
-
+
//-----------------------------------------------------------------------------
class DefaultContentionManager : public base_contention_manager
{
Modified: sandbox/stm/branches/vbe/boost/stm/detail/config.hpp
==============================================================================
--- sandbox/stm/branches/vbe/boost/stm/detail/config.hpp (original)
+++ sandbox/stm/branches/vbe/boost/stm/detail/config.hpp 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -35,8 +35,8 @@
#define USE_SINGLE_THREAD_CONTEXT_MAP 1
//#define BOOST_STM_HAVE_SINGLE_TSS_CONTEXT_MAP 1
-
-
+
+
///////////////////////////////////////////////////////////////////////////////
// When USE_SINGLE_THREAD_CONTEXT_MAP or BOOST_STM_HAVE_SINGLE_TSS_CONTEXT_MAP are defined you can want to store references to the TSS or not
// BOOST_STM_TX_CONTAINS_REFERENCES_TO_TSS_FIELDS if you want to add these references
@@ -44,14 +44,14 @@
#define BOOST_STM_TX_CONTAINS_REFERENCES_TO_TSS_FIELDS 1
///////////////////////////////////////////////////////////////////////////////
-// Define only one of
+// Define only one of
// BOOST_STM_CM_STATIC_CONF when you want a staticacly configured CM
// BOOST_STM_CM_DYNAMIC_CONF when you want a polymorphic CM configured at run time
#define BOOST_STM_CM_STATIC_CONF 1
//#define BOOST_STM_CM_DYNAMIC_CONF 1
-// Define only one of
+// Define only one of
// BOOST_STM_CM_STATIC_CONF_except_and_back_off_on_abort_notice_cm when configuration manager is except_and_back_off_on_abort_notice_cm
#define BOOST_STM_CM_STATIC_CONF_except_and_back_off_on_abort_notice_cm 1
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 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -883,7 +883,7 @@
return;
}
- while (0 != trylock(&transactionMutex_)) {
+ while (0 != trylock(&transactionMutex_)) {
//std::cout << __LINE__ << " invalidating_deferred_end_transaction" << std::endl;
}
@@ -2171,7 +2171,7 @@
if (cm_permission_to_abort(*this, aborted))
{
// ok, forced to aborts are allowed, do them
- for (std::list<transaction*>::iterator k = aborted.begin();
+ for (std::list<transaction*>::iterator k = aborted.begin();
k != aborted.end(); ++k)
{
(*k)->force_to_abort();
Modified: sandbox/stm/branches/vbe/boost/stm/exceptions.hpp
==============================================================================
--- sandbox/stm/branches/vbe/boost/stm/exceptions.hpp (original)
+++ sandbox/stm/branches/vbe/boost/stm/exceptions.hpp 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -24,7 +24,7 @@
namespace boost { namespace stm {
class aborted_transaction_exception_no_unlocks {};
-
+
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
class aborted_transaction_exception : public std::exception
Modified: sandbox/stm/branches/vbe/boost/stm/non_tx/detail/cache_map.hpp
==============================================================================
--- sandbox/stm/branches/vbe/boost/stm/non_tx/detail/cache_map.hpp (original)
+++ sandbox/stm/branches/vbe/boost/stm/non_tx/detail/cache_map.hpp 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -25,7 +25,7 @@
namespace boost { namespace stm {
namespace non_tx { namespace detail {
-
+
//-----------------------------------------------------------------------------
// This class defines the transactional cache of a non transactional variable.
// There is a map from the address of the variable of type T to an instance of this class
@@ -49,7 +49,7 @@
inline ~cache() {
delete ptr_;
}
-
+
inline T const * get() const {
if(ptr_!=0) return ptr_;
else return value_;
@@ -85,7 +85,7 @@
ptr_=0;
delete this;
}
-#endif
+#endif
virtual void copy_state(base_transaction_object const * const rhs) {
if (value_==0) return;
*value_= *(static_cast<cache<T> const * const>(rhs)->ptr_);
@@ -94,10 +94,10 @@
}
#if BOOST_STM_USE_SPECIFIC_TRANSACTION_MEMORY_MANAGER
- void* operator new(size_t size, transaction* t)
+ void* operator new(size_t size, transaction* t)
{
return boost::stm::cache_allocate<cache<T> >(t);
- }
+ }
#if USE_STM_MEMORY_MANAGER
void* operator new(size_t size) throw ()
{
@@ -108,7 +108,7 @@
{
return_mem(mem, sizeof(cache<T>));
}
-#else
+#else
void* operator new(size_t size) throw ()
{
return ::operator new(size);
Modified: sandbox/stm/branches/vbe/boost/stm/non_tx/smart_ptr.hpp
==============================================================================
--- sandbox/stm/branches/vbe/boost/stm/non_tx/smart_ptr.hpp (original)
+++ sandbox/stm/branches/vbe/boost/stm/non_tx/smart_ptr.hpp 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -33,7 +33,7 @@
class wr_ptr;
template <typename T>
class upgrd_ptr;
-
+
//-----------------------------------------------------------------------------
// A rd_ptr<T> ("read pointer") points to an object that the current
// transaction has opened for read only access.
@@ -68,7 +68,7 @@
ptr_=tx_.insert_and_return_read_memory(*detail::cache_map::get(ptr));
return *this;
}
-
+
template<class Y>
inline rd_ptr & operator=(Y const& ref) { // never throws
ptr_=tx_.insert_and_return_read_memory(*detail::cache_map::get(&ref));
@@ -155,13 +155,13 @@
ptr_(const_cast<detail::cache<T>*>(t.read_ptr(detail::cache_map::get(&ref)))), written_(false) {}
template<class Y>
- inline upgrd_ptr & operator=(Y* ptr) {
+ inline upgrd_ptr & operator=(Y* ptr) {
ptr_=const_cast<detail::cache<T>*>(tx_->read_ptr(detail::cache_map::get(ptr)));
return *this;
}
template<class Y>
- inline upgrd_ptr & operator=(Y& ref) {
+ inline upgrd_ptr & operator=(Y& ref) {
ptr_=const_cast<detail::cache<T>*>(tx_->read_ptr(detail::cache_map::get(&ref)));
return *this;
}
Modified: sandbox/stm/branches/vbe/boost/stm/shallow_transaction_object.hpp
==============================================================================
--- sandbox/stm/branches/vbe/boost/stm/shallow_transaction_object.hpp (original)
+++ sandbox/stm/branches/vbe/boost/stm/shallow_transaction_object.hpp 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -37,7 +37,7 @@
// forward declarations
//-----------------------------------------------------------------------------
class transaction;
-
+
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
@@ -65,12 +65,12 @@
Derived* tmp = cache_clone(t, *static_cast<Derived const*>(this));
return tmp;
}
-
+
//--------------------------------------------------------------------------
virtual void cache_deallocate() {
boost::stm::cache_deallocate(this);
}
-
+
//--------------------------------------------------------------------------
virtual void copy_state(base_transaction_object const * const rhs)
{
Modified: sandbox/stm/branches/vbe/boost/stm/transaction.hpp
==============================================================================
--- sandbox/stm/branches/vbe/boost/stm/transaction.hpp (original)
+++ sandbox/stm/branches/vbe/boost/stm/transaction.hpp 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -72,7 +72,7 @@
// immediately).
//-----------------------------------------------------------------------------
bool const begin_transaction = true;
-
+
#if defined(BOOST_STM_CM_STATIC_CONF)
#if defined(BOOST_STM_CM_STATIC_CONF_except_and_back_off_on_abort_notice_cm)
typedef except_and_back_off_on_abort_notice_cm contention_manager_type;
@@ -269,13 +269,13 @@
static bool cm_abort_before_commit(transaction const &t) {return contention_manager_type::abort_before_commit(t); }
static bool cm_permission_to_abort
- (transaction const &lhs, transaction const &rhs)
+ (transaction const &lhs, transaction const &rhs)
{return contention_manager_type::permission_to_abort(lhs,rhs); }
static bool cm_permission_to_abort
(transaction const &lhs, std::list<transaction*> &rhs)
{return contention_manager_type::permission_to_abort(lhs,rhs); }
-
+
static bool cm_allow_lock_to_abort_tx(int const & lockWaitTime, int const &lockAborted,
bool txIsIrrevocable, transaction const &rhs) {
return contention_manager_type::allow_lock_to_abort_tx(lockWaitTime,lockAborted,txIsIrrevocable,rhs); }
@@ -746,7 +746,7 @@
make_irrevocable();
return as_new(new T());
}
-
+
//--------------------------------------------------------------------------
template <typename T>
T* new_memory(T*)
@@ -774,7 +774,7 @@
}
void end();
- void commit() {end();}
+ bool commit() {end(); return true;}
void no_throw_end();
void force_to_abort()
@@ -1750,7 +1750,7 @@
return i->second->currentlyLockedLocks_;
}
#endif
-
+
TransactionsStack& transactionsRef_;
public:
inline TransactionsStack& transactions() {return transactionsRef_;}
@@ -1759,7 +1759,7 @@
return i->second->transactions_;
}
private:
-
+
#endif
Modified: sandbox/stm/branches/vbe/boost/stm/transaction_object.hpp
==============================================================================
--- sandbox/stm/branches/vbe/boost/stm/transaction_object.hpp (original)
+++ sandbox/stm/branches/vbe/boost/stm/transaction_object.hpp 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -37,7 +37,7 @@
// forward declarations
//-----------------------------------------------------------------------------
class transaction;
-
+
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
@@ -71,7 +71,7 @@
Derived* tmp = new Derived(*static_cast<Derived const*>(this));
return tmp;
}
-#endif
+#endif
//--------------------------------------------------------------------------
#if BOOST_STM_USE_SPECIFIC_TRANSACTION_MEMORY_MANAGER
@@ -84,7 +84,7 @@
delete this;
}
#endif
-
+
//--------------------------------------------------------------------------
virtual void copy_state(base_transaction_object const * const rhs)
{
@@ -100,10 +100,10 @@
#endif
#if BOOST_STM_USE_SPECIFIC_TRANSACTION_MEMORY_MANAGER
- void* operator new(size_t size, transaction* t)
+ void* operator new(size_t size, transaction* t)
{
return boost::stm::cache_allocate<Derived>(t);
- }
+ }
#if USE_STM_MEMORY_MANAGER
void* operator new(size_t size) throw ()
{
@@ -122,7 +122,7 @@
return ::operator new(size);
}
#endif
-#else
+#else
#if USE_STM_MEMORY_MANAGER
void* operator new(size_t size) throw ()
{
Modified: sandbox/stm/branches/vbe/boost/stm/transaction_object_ptr.hpp
==============================================================================
--- sandbox/stm/branches/vbe/boost/stm/transaction_object_ptr.hpp (original)
+++ sandbox/stm/branches/vbe/boost/stm/transaction_object_ptr.hpp 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -30,7 +30,7 @@
transaction_object_ptr(transaction_object_ptr & rhs) : base_type(rhs), ptr_(rhs.rhs) {}
transaction_object_ptr(TO* ptr) : base_type(), ptr_(ptr) {}
~transaction_object_ptr() {}
-
+
this_type& operator=(TO* rhs) {
ptr_=rhs;
return *this;
Modified: sandbox/stm/branches/vbe/boost/stm/transactional_object.hpp
==============================================================================
--- sandbox/stm/branches/vbe/boost/stm/transactional_object.hpp (original)
+++ sandbox/stm/branches/vbe/boost/stm/transactional_object.hpp 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -82,7 +82,7 @@
return new transactional_object<T>(*this);
}
#endif
-
+
virtual void cache_deallocate() {
//boost::stm::cache_deallocate(this);
delete this;
@@ -94,10 +94,10 @@
}
#if BOOST_STM_USE_SPECIFIC_TRANSACTION_MEMORY_MANAGER
- void* operator new(size_t size, transaction* t)
+ void* operator new(size_t size, transaction* t)
{
return cache_allocate<transactional_object<T> >(t);
- }
+ }
#if USE_STM_MEMORY_MANAGER
void* operator new(size_t size) throw ()
{
Modified: sandbox/stm/branches/vbe/boost/stm/tx/numeric.hpp
==============================================================================
--- sandbox/stm/branches/vbe/boost/stm/tx/numeric.hpp (original)
+++ sandbox/stm/branches/vbe/boost/stm/tx/numeric.hpp 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -45,7 +45,7 @@
#if 0
template<class U>
numeric& operator=(numeric<U> const& r) {
- val_=r.value();
+ val_=r.value();
}
#endif
Modified: sandbox/stm/branches/vbe/boost/stm/tx/pointer.hpp
==============================================================================
--- sandbox/stm/branches/vbe/boost/stm/tx/pointer.hpp (original)
+++ sandbox/stm/branches/vbe/boost/stm/tx/pointer.hpp 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -81,14 +81,14 @@
T const & operator*() const {
return *this->get();
}
-
+
T * operator->() {
return this->get();
}
T & operator*() {
return *this->get();
}
-
+
};
template <typename C, typename R>
@@ -134,7 +134,7 @@
}
return val_;
}
-
+
};
#if 0
Modified: sandbox/stm/branches/vbe/boost/stm/tx/smart_ptr.hpp
==============================================================================
--- sandbox/stm/branches/vbe/boost/stm/tx/smart_ptr.hpp (original)
+++ sandbox/stm/branches/vbe/boost/stm/tx/smart_ptr.hpp 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -47,7 +47,7 @@
//
template<class Y>
- tx_obj(tx_obj<Y> const& r) : obj_(r.ref()) {}
+ tx_obj(tx_obj<Y> const& r) : obj_(r.ref()) {}
template <typename T1>
tx_obj(T1 p1) : obj_(p1) {}
@@ -246,7 +246,7 @@
return lhs.ptr_!=rhs.ptr_ && lhs.get()!=rhs.ptr_ && lhs.ptr_!=rhs.get();
}
-template<class T>
+template<class T>
inline void swap(tx_ptr<T> & a, tx_ptr<T> & b) {
a.swap(b);
}
@@ -465,7 +465,7 @@
inline operator unspecified_bool_type() const {
return ptr_ == 0? 0: &this_type::ptr_;
}
-
+
inline void write_ptr(transactional_object<T>* ptr) {
ptr_ = ptr;
written_ = true;
Modified: sandbox/stm/branches/vbe/libs/stm/example/counter_ptr.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/example/counter_ptr.cpp (original)
+++ sandbox/stm/branches/vbe/libs/stm/example/counter_ptr.cpp 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -109,7 +109,7 @@
th2.join();
th3.join();
th4.join();
-
+
int fails=0;
fails += check(2);
fails += !assign();
Modified: sandbox/stm/branches/vbe/libs/stm/example/list.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/example/list.cpp (original)
+++ sandbox/stm/branches/vbe/libs/stm/example/list.cpp 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -57,7 +57,7 @@
list()
: head_(BOOST_STM_NEW_1(transactional_object<list_node<T> >()))
, size_(BOOST_STM_NEW_1(transactional_object<std::size_t>(0)))
- {
+ {
std::cout << "list().head_" << *head_.get() << std::endl;
std::cout << "list().size_" << *size_.get() << std::endl;
}
Modified: sandbox/stm/branches/vbe/libs/stm/src/except_and_back_off_on_abort_notice_cm.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/src/except_and_back_off_on_abort_notice_cm.cpp (original)
+++ sandbox/stm/branches/vbe/libs/stm/src/except_and_back_off_on_abort_notice_cm.cpp 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -103,7 +103,7 @@
return true;
}
- bool except_and_back_off_on_abort_notice_cm::permission_to_abort(transaction const &lhs, std::list<transaction*> &rhs)
+ bool except_and_back_off_on_abort_notice_cm::permission_to_abort(transaction const &lhs, std::list<transaction*> &rhs)
{
#ifdef JUST_PRIORITY
int setSize = (lhs.writes() * lhs.priority()) +
@@ -119,7 +119,7 @@
for (std::list<core::transaction*>::iterator iter = rhs.begin();
iter != rhs.end(); ++iter)
{
- if ((*iter)->priority() > highestPriority)
+ if ((*iter)->priority() > highestPriority)
{
highestPriority = (*iter)->priority();
}
@@ -146,7 +146,7 @@
}
#else
- double setSize = (lhs.writes() * lhs.priority()) +
+ double setSize = (lhs.writes() * lhs.priority()) +
(lhs.reads() * lhs.priority());
double abortSetSize = 0;
double abortPriority = 0;
@@ -155,7 +155,7 @@
int mem = lhs.reads() + (lhs.writes() * 10);
double decrementing = 1.0;
- for (std::list<boost::stm::transaction*>::iterator iter = rhs.begin();
+ for (std::list<boost::stm::transaction*>::iterator iter = rhs.begin();
iter != rhs.end(); ++iter)
{
if ((*iter)->reads() > mem) hasLargestReadSet = false;
@@ -172,7 +172,7 @@
if (hasLargestReadSet) return true;
- if (setSize >=
+ if (setSize >=
(abortPriority / setSize) + (abortSetSize / setSize))
{
return true;
@@ -183,7 +183,7 @@
}
#endif
}
-
+
bool except_and_back_off_on_abort_notice_cm::allow_lock_to_abort_tx
(int const & lockWaitTime, int const &lockAborted, bool txTryingToAbortIsIrrevocable, transaction const &rhs)
{
Modified: sandbox/stm/branches/vbe/libs/stm/src/transaction.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/src/transaction.cpp (original)
+++ sandbox/stm/branches/vbe/libs/stm/src/transaction.cpp 2009-10-12 16:51:03 EDT (Mon, 12 Oct 2009)
@@ -21,7 +21,7 @@
namespace boost { namespace stm {
namespace non_tx {
std::map<void*, base_transaction_object*> detail::cache_map::map_;
-
+
}
///////////////////////////////////////////////////////////////////////////////
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk