Subject: [Boost-commit] svn:boost r62285 - sandbox/stm/branches/vbe/libs/stm/test
From: vicente.botet_at_[hidden]
Date: 2010-05-27 21:42:23
Author: viboes
Date: 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
New Revision: 62285
URL: http://svn.boost.org/trac/boost/changeset/62285
Log:
Boost.STM/vbe:
* Use stm.hpp file instead of transaction.hpp
Text files modified:
sandbox/stm/branches/vbe/libs/stm/test/Jamfile.v2 | 34 +++++++++++++++++-----------------
sandbox/stm/branches/vbe/libs/stm/test/irrevocableInt.cpp | 2 +-
sandbox/stm/branches/vbe/libs/stm/test/isolatedComposedIntLockInTx.cpp | 4 ++--
sandbox/stm/branches/vbe/libs/stm/test/isolatedComposedIntLockInTx2.cpp | 4 ++--
sandbox/stm/branches/vbe/libs/stm/test/isolatedInt.cpp | 2 +-
sandbox/stm/branches/vbe/libs/stm/test/isolatedIntLockInTx.cpp | 4 ++--
sandbox/stm/branches/vbe/libs/stm/test/litExample.cpp | 4 ++--
sandbox/stm/branches/vbe/libs/stm/test/lotExample.cpp | 4 ++--
sandbox/stm/branches/vbe/libs/stm/test/main.h | 2 +-
sandbox/stm/branches/vbe/libs/stm/test/nestedTxs.h | 2 +-
sandbox/stm/branches/vbe/libs/stm/test/pointer_test.cpp | 2 +-
sandbox/stm/branches/vbe/libs/stm/test/smart.cpp | 4 ++--
sandbox/stm/branches/vbe/libs/stm/test/stm.cpp | 2 +-
sandbox/stm/branches/vbe/libs/stm/test/testHT_latm.h | 2 +-
sandbox/stm/branches/vbe/libs/stm/test/testHashMap.h | 2 +-
sandbox/stm/branches/vbe/libs/stm/test/testHashMapWithLocks.h | 2 +-
sandbox/stm/branches/vbe/libs/stm/test/testInt.cpp | 2 +-
sandbox/stm/branches/vbe/libs/stm/test/testInt.h | 2 +-
sandbox/stm/branches/vbe/libs/stm/test/testLL_latm.h | 4 ++--
sandbox/stm/branches/vbe/libs/stm/test/testLinkedList.h | 2 +-
sandbox/stm/branches/vbe/libs/stm/test/testLinkedListBig.h | 2 +-
sandbox/stm/branches/vbe/libs/stm/test/testLinkedListWithLocks.h | 4 ++--
sandbox/stm/branches/vbe/libs/stm/test/testPerson.h | 2 +-
sandbox/stm/branches/vbe/libs/stm/test/testRBTree.h | 2 +-
sandbox/stm/branches/vbe/libs/stm/test/txLinearLock.cpp | 4 ++--
sandbox/stm/branches/vbe/libs/stm/test/usingLockTx.h | 6 +++---
26 files changed, 53 insertions(+), 53 deletions(-)
Modified: sandbox/stm/branches/vbe/libs/stm/test/Jamfile.v2
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/Jamfile.v2 (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/Jamfile.v2 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -55,7 +55,7 @@
:
[ run stm : -bench accounts -def -threads 2 -inserts 100 : : : accounts_def_t2_i100 ]
[ run stm : -bench accounts -def -threads 4 -inserts 100 : : : accounts_def_t4_i100 ]
-
+
[ run stm : -bench hashmap -def -threads 2 -inserts 100 : : : hashmap_def_t2_i100 ]
[ run stm : -bench ht -def -threads 2 -inserts 100 -latm tm : : : ht_def_tm_t2_i100 ]
@@ -85,7 +85,7 @@
[ run stm : -bench list_hash_w_locks -def -threads 2 -inserts 100 -latm tm : : : list_hash_w_locks_def_tm_t2_i100 ]
[ run stm : -bench list_hash_w_locks -def -threads 2 -inserts 100 -latm tx : : : list_hash_w_locks_def_tx_t2_i100 ]
[ run stm : -bench list_hash_w_locks -def -threads 4 -inserts 100 -latm tx : : : list_hash_w_locks_def_tx_t4_i100 ]
-
+
[ run stm : -bench ll -def -threads 2 -inserts 100 -latm tm : : : ll_def_tm_t2_i100 ]
[ run stm : -bench linkedlist -def -threads 4 -inserts 100 : : : linkedlist_def_t4_i100 ]
@@ -97,7 +97,7 @@
[ run stm : -bench irrevocable_int -def -threads 4 -inserts 100 : : : irrevocable_int_def_t4_i100 ]
[ run stm : -bench rbtree -def -threads 4 -inserts 100 : : : rbtree_def_t4_i100 ]
-
+
;
alias dir_invalid
@@ -139,7 +139,7 @@
[ run stm : -bench rbtree -dir -threads 4 -inserts 100 : : : rbtree_dir_t4_i100 ]
-
+
[ run stm : -bench hashmap_w_locks -dir -threads 4 -inserts 100 -latm full : : : hashmap_w_locks_dir_full_t4_i100 ]
[ run stm : -bench hashmap_w_locks -dir -threads 4 -inserts 100 -latm tm : : : hashmap_w_locks_dir_tm_t4_i100 ]
[ run stm : -bench hashmap_w_locks -dir -threads 4 -inserts 100 -latm tx : : : hashmap_w_locks_dir_tx_t4_i100 ]
@@ -147,7 +147,7 @@
[ run stm : -bench list_hash_w_locks -dir -threads 4 -inserts 100 -latm full : : : list_hash_w_locks_dir_full_t4_i100 ]
[ run stm : -bench list_hash_w_locks -dir -threads 4 -inserts 100 -latm tm : : : list_hash_w_locks_dir_tm_t4_i100 ]
[ run stm : -bench list_hash_w_locks -dir -threads 4 -inserts 100 -latm tx : : : list_hash_w_locks_dir_tx_t4_i100 ]
-
+
[ run stm : -bench using_linkedlist -dir -threads 2 -inserts 100 -latm full : : : using_linkedlist_dir_full_t2_i100 ]
[ run stm : -bench using_linkedlist -dir -threads 2 -inserts 100 -latm tm : : : using_linkedlist_dir_tm_t2_i100 ]
[ run stm : -bench using_linkedlist -dir -threads 2 -inserts 100 -latm tx : : : using_linkedlist_dir_tx_t2_i100 ]
@@ -159,7 +159,7 @@
alias embedded
:
[ run-fail ../example/embed.cpp ]
- #[ run ../example/property_test.cpp ]
+ #[ run ../example/tx/nest_cost.cpp ]
;
alias examples_tx
@@ -221,15 +221,15 @@
alias fails_sometimes
:
# all worked several times without failure at 2010/03/14
-
+
;
-
+
alias fails_often
:
# all failed at 2010/03/14 several times
- ########### fails sometimes 3 times 2010/03/14 succeed 2010/03/14
+ ########### fails sometimes 3 times 2010/03/14 succeed 2010/03/14
[ run stm : -bench ll -dir -threads 4 -inserts 100 -latm tx : : : ll_dir_t4_tx_i100 ]
########### fails 3 consecutive times 2010/03/14 suceeded at 2010/??/??
@@ -245,7 +245,7 @@
alias fails_always
:
-
+
########### fails
# /bin/sh: line 4: 2944 Aborted (core dumped) "bin/ht_def_t2_i1000.test/gcc-3.4.4/debug/threading-multi/ht_def_t2_i1000.exe" > "bin/ht_def_t2_i1000.test/gcc-3.4.4/debug/threading-multi/ht_def_t2_i1000.output" 2>&1
# Rounding max threads to the next multiple of 4 (4).
@@ -264,14 +264,14 @@
[ run stm : -bench tx_linear_lock -dir -threads 2 -inserts 100 -latm tm : : : tx_linear_lock_dir_tm_t2_i100 ]
########### fails
[ run stm : -bench tx_linear_lock -def -threads 2 -inserts 100 -latm tm : : : tx_linear_lock_def_tm_t2_i100 ]
-
+
########### fails all-modes
# /bin/sh: line 4: 3660 Segmentation fault (core dumped) "bin/isolated_composed_int_lock_def_t2.test/gcc-3.4.4/debug/threading-multi/isolated_composed_int_lock_def_t2.exe" > "bin/isolated_composed_int_lock_def_t2.test/gcc-3.4.4/debug/threading-multi/isolated_composed_int_lock_def_t2.output" 2>&1
# assertion "res==0" failed: file "../../../boost/synchro/pthread/mutex.hpp", line 40
[ run stm : -bench isolated_composed_int_lock -def -threads 2 -inserts 100 -latm full : : : isolated_composed_int_lock_def_full_t2_i100 ]
########### fails
# /bin/sh: line 4: 4744 Aborted (core dumped) "bin/gcc-3.4.4/debug/threading-multi/stm.exe" -bench isolated_composed_int_lock -def -threads 2 -inserts 100 -latm tm > "bin/isolated_composed_int_lock_def_tm_t2_i100.test/gcc-3.4.4/debug/threading-multi/isolated_composed_int_lock_def_tm_t2_i100.output" 2>&1
- [ run stm : -bench isolated_composed_int_lock -def -threads 2 -inserts 100 -latm tm : : : isolated_composed_int_lock_def_tm_t2_i100 ]
+ [ run stm : -bench isolated_composed_int_lock -def -threads 2 -inserts 100 -latm tm : : : isolated_composed_int_lock_def_tm_t2_i100 ]
########### fails
# /bin/sh: line 4: 4772 Aborted (core dumped) "bin/gcc-3.4.4/debug/threading-multi/stm.exe" -bench isolated_composed_int_lock -def -threads 2 -inserts 100 -latm tx > "bin/isolated_composed_int_lock_def_tx_t2_i100.test/gcc-3.4.4/debug/threading-multi/isolated_composed_int_lock_def_tx_t2_i100.output" 2>&1
[ run stm : -bench isolated_composed_int_lock -def -threads 2 -inserts 100 -latm tx : : : isolated_composed_int_lock_def_tx_t2_i100 ]
@@ -332,8 +332,8 @@
alias deadlock
:
-
-
+
+
########### deadlock after 3:14 at 2010/03/14 (blocks bjam)
#[ run stm : -bench smart -def -threads 4 -inserts 100 : : : smart_def_t4_i100 ]
########### fails with CHECK all-modes
@@ -345,7 +345,7 @@
########### fails
#[ run stm : -bench lit_example -dir -threads 2 -inserts 100 -latm tm : : : lit_example_dir_tm_t2_i100 ]
;
-
+
alias livelock
:
@@ -375,7 +375,7 @@
########### deadlock. killed after 0:20. 00% CPU all-modes all-modes
#[ run stm : -bench isolated_composed_int_lock -dir -threads 2 -inserts 100 -latm full : : : isolated_composed_int_lock_dir_full_t2_i100 ]
-
+
########### deadlock. killed after 0:20. 00% CPU all-modes
#[ run stm : -bench lot_example -dir -threads 2 -inserts 100 -latm full : : : lot_example_dir_full_t2_i100 ]
########### deadlock
@@ -392,7 +392,7 @@
#[ run stm : -bench nested_tx -dir -threads 2 -inserts 100 -latm full : : : nested_tx_dir_full_t2_i100 ]
#[ run stm : -bench nested_tx -dir -threads 2 -inserts 100 -latm tm : : : nested_tx_dir_tm_t2_i100 ]
#[ run stm : -bench nested_tx -dir -threads 2 -inserts 100 -latm tx : : : nested_tx_dir_tx_t2_i100 ]
-
+
# deadlock
#[ run stm : -bench smart -dir -threads 4 -inserts 100 : : : smart_dir_t4_i100 ]
;
Modified: sandbox/stm/branches/vbe/libs/stm/test/irrevocableInt.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/irrevocableInt.cpp (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/irrevocableInt.cpp 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -32,7 +32,7 @@
#include <iostream>
#include "irrevocableInt.h"
-#include <boost/stm/transaction.hpp>
+#include <boost/stm.hpp>
#include "main.h"
static boost::stm::native_trans<int> gInt;
Modified: sandbox/stm/branches/vbe/libs/stm/test/isolatedComposedIntLockInTx.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/isolatedComposedIntLockInTx.cpp (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/isolatedComposedIntLockInTx.cpp 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -32,8 +32,8 @@
#include <iostream>
#include "isolatedComposedIntLockInTx.h"
-#include <boost/stm/transaction.hpp>
-#include <boost/stm/synch.hpp>
+#include <boost/stm.hpp>
+//~ #include <boost/stm/synch.hpp>
#include "main.h"
#ifndef BOOST_STM_T_USE_BOOST_MUTEX
Modified: sandbox/stm/branches/vbe/libs/stm/test/isolatedComposedIntLockInTx2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/isolatedComposedIntLockInTx2.cpp (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/isolatedComposedIntLockInTx2.cpp 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -32,8 +32,8 @@
#include <iostream>
#include "isolatedComposedIntLockInTx.h"
-#include <boost/stm/transaction.hpp>
-#include <boost/stm/synch.hpp>
+#include <boost/stm.hpp>
+//~ #include <boost/stm/synch.hpp>
#include "main.h"
#ifndef BOOST_STM_T_USE_BOOST_MUTEX
Modified: sandbox/stm/branches/vbe/libs/stm/test/isolatedInt.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/isolatedInt.cpp (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/isolatedInt.cpp 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -32,7 +32,7 @@
#include <iostream>
#include "isolatedInt.h"
-#include <boost/stm/transaction.hpp>
+#include <boost/stm.hpp>
#include "main.h"
static boost::stm::native_trans<int> gInt;
Modified: sandbox/stm/branches/vbe/libs/stm/test/isolatedIntLockInTx.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/isolatedIntLockInTx.cpp (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/isolatedIntLockInTx.cpp 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -32,8 +32,8 @@
#include <iostream>
#include "isolatedInt.h"
-#include <boost/stm/transaction.hpp>
-#include <boost/stm/synch.hpp>
+#include <boost/stm.hpp>
+//~ #include <boost/stm/synch.hpp>
#include "main.h"
#ifndef BOOST_STM_T_USE_BOOST_MUTEX
Modified: sandbox/stm/branches/vbe/libs/stm/test/litExample.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/litExample.cpp (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/litExample.cpp 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -32,8 +32,8 @@
#include <iostream>
#include "litExample.h"
-#include <boost/stm/transaction.hpp>
-#include <boost/stm/synch.hpp>
+#include <boost/stm.hpp>
+//~ #include <boost/stm/synch.hpp>
#include "main.h"
#ifndef BOOST_STM_T_USE_BOOST_MUTEX
Modified: sandbox/stm/branches/vbe/libs/stm/test/lotExample.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/lotExample.cpp (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/lotExample.cpp 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -32,8 +32,8 @@
#include <iostream>
#include "lotExample.h"
-#include <boost/stm/transaction.hpp>
-#include <boost/stm/synch.hpp>
+#include <boost/stm.hpp>
+//~ #include <boost/stm/synch.hpp>
#include "main.h"
#ifndef BOOST_STM_T_USE_BOOST_MUTEX
Modified: sandbox/stm/branches/vbe/libs/stm/test/main.h
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/main.h (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/main.h 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -14,7 +14,7 @@
#ifndef MAIN_H
#define MAIN_H
-#include <boost/stm/transaction.hpp>
+#include <boost/stm.hpp>
namespace nMain
{
Modified: sandbox/stm/branches/vbe/libs/stm/test/nestedTxs.h
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/nestedTxs.h (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/nestedTxs.h 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -16,7 +16,7 @@
#define NESTED_TXS_H
#include "main.h"
-#include <boost/stm/transaction.hpp>
+#include <boost/stm.hpp>
#include <pthread.h>
#include <fstream>
Modified: sandbox/stm/branches/vbe/libs/stm/test/pointer_test.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/pointer_test.cpp (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/pointer_test.cpp 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -32,7 +32,7 @@
#include <iostream>
#include "lotExample.h"
-#include <boost/stm/transaction.hpp>
+#include <boost/stm.hpp>
#include "main.h"
using namespace boost::stm;
Modified: sandbox/stm/branches/vbe/libs/stm/test/smart.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/smart.cpp (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/smart.cpp 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -13,8 +13,8 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-#include <boost/stm/transaction.hpp>
-#include <boost/stm/tx_ptr.hpp>
+#include <boost/stm.hpp>
+//~ #include <boost/stm/tx_ptr.hpp>
#include "smart.h"
#include "main.h"
Modified: sandbox/stm/branches/vbe/libs/stm/test/stm.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/stm.cpp (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/stm.cpp 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -12,7 +12,7 @@
//////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////
-#include <boost/stm/transaction.hpp>
+#include <boost/stm.hpp>
#include "main.h"
#include <sstream>
Modified: sandbox/stm/branches/vbe/libs/stm/test/testHT_latm.h
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/testHT_latm.h (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/testHT_latm.h 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -16,7 +16,7 @@
#define LATM_HASH_MAP_WITH_LOCKS_H
///////////////////////////////////////////////////////////////////////////////
-#include <boost/stm/transaction.hpp>
+#include <boost/stm.hpp>
#include "testLL_latm.h"
void TestHashMapWithLocks();
Modified: sandbox/stm/branches/vbe/libs/stm/test/testHashMap.h
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/testHashMap.h (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/testHashMap.h 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -16,7 +16,7 @@
#define HASH_MAP_H
///////////////////////////////////////////////////////////////////////////////
-#include <boost/stm/transaction.hpp>
+#include <boost/stm.hpp>
#include "testLinkedList.h"
void TestHashMapWithMultipleThreads();
Modified: sandbox/stm/branches/vbe/libs/stm/test/testHashMapWithLocks.h
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/testHashMapWithLocks.h (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/testHashMapWithLocks.h 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -16,7 +16,7 @@
#define HASH_MAP_WITH_LOCKS_H
///////////////////////////////////////////////////////////////////////////////
-#include <boost/stm/transaction.hpp>
+#include <boost/stm.hpp>
#include "testLinkedListWithLocks.h"
void TestHashMapWithLocks();
Modified: sandbox/stm/branches/vbe/libs/stm/test/testInt.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/testInt.cpp (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/testInt.cpp 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -12,7 +12,7 @@
//////////////////////////////////////////////////////////////////////////////
#include "testInt.h"
-#include <boost/stm/transaction.hpp>
+#include <boost/stm.hpp>
Integer *globalInt = 0;
Modified: sandbox/stm/branches/vbe/libs/stm/test/testInt.h
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/testInt.h (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/testInt.h 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -14,7 +14,7 @@
#ifndef TEST_INT_H
#define TEST_INT_H
-#include <boost/stm/transaction.hpp>
+#include <boost/stm.hpp>
////////////////////////////////////////////////////////////////////////////
// Int Transaction class
Modified: sandbox/stm/branches/vbe/libs/stm/test/testLL_latm.h
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/testLL_latm.h (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/testLL_latm.h 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -16,8 +16,8 @@
#define TEST_LINKED_LIST_WITH_LOCKS_H
#include "main.h"
-#include <boost/stm/transaction.hpp>
-#include <boost/stm/synch.hpp>
+#include <boost/stm.hpp>
+//~ #include <boost/stm/synch.hpp>
#include <pthread.h>
#include <fstream>
Modified: sandbox/stm/branches/vbe/libs/stm/test/testLinkedList.h
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/testLinkedList.h (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/testLinkedList.h 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -20,7 +20,7 @@
//#define BOOST_STM_LL_USES_NODE 1
#include "main.h"
-#include <boost/stm/transaction.hpp>
+#include <boost/stm.hpp>
#include <fstream>
Modified: sandbox/stm/branches/vbe/libs/stm/test/testLinkedListBig.h
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/testLinkedListBig.h (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/testLinkedListBig.h 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -16,7 +16,7 @@
#define TEST_LINKED_LIST_H
#include "main.h"
-#include <boost/stm/transaction.hpp>
+#include <boost/stm.hpp>
#include <fstream>
Modified: sandbox/stm/branches/vbe/libs/stm/test/testLinkedListWithLocks.h
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/testLinkedListWithLocks.h (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/testLinkedListWithLocks.h 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -16,8 +16,8 @@
#define TEST_LINKED_LIST_WITH_LOCKS_H
#include "main.h"
-#include <boost/stm/transaction.hpp>
-#include <boost/stm/synch.hpp>
+#include <boost/stm.hpp>
+//~ #include <boost/stm/synch.hpp>
#include <pthread.h>
#include <fstream>
Modified: sandbox/stm/branches/vbe/libs/stm/test/testPerson.h
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/testPerson.h (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/testPerson.h 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -16,7 +16,7 @@
#include <iostream>
#include "main.h"
-#include <boost/stm/transaction.hpp>
+#include <boost/stm.hpp>
void TestPerson();
Modified: sandbox/stm/branches/vbe/libs/stm/test/testRBTree.h
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/testRBTree.h (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/testRBTree.h 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -17,7 +17,7 @@
#include <string>
#include <sstream>
#include <fstream>
-#include <boost/stm/transaction.hpp>
+#include <boost/stm.hpp>
void TestRedBlackTree();
void TestRedBlackTreeWithMultipleThreads();
Modified: sandbox/stm/branches/vbe/libs/stm/test/txLinearLock.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/txLinearLock.cpp (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/txLinearLock.cpp 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -13,8 +13,8 @@
#include <iostream>
#include "txLinearLock.h"
-#include <boost/stm/transaction.hpp>
-#include <boost/stm/synch.hpp>
+#include <boost/stm.hpp>
+//~ #include <boost/stm/synch.hpp>
#include "main.h"
static boost::stm::native_trans<int> gInt1;
Modified: sandbox/stm/branches/vbe/libs/stm/test/usingLockTx.h
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/usingLockTx.h (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/usingLockTx.h 2010-05-27 21:42:19 EDT (Thu, 27 May 2010)
@@ -17,9 +17,9 @@
#include "main.h"
#include "testHT_latm.h"
-#include <boost/stm/transaction.hpp>
-#include <boost/stm/synch/auto_lock.hpp>
-#include <boost/stm/synch.hpp>
+#include <boost/stm.hpp>
+//~ #include <boost/stm/synch/auto_lock.hpp>
+//~ #include <boost/stm/synch.hpp>
#include <pthread.h>
#include <fstream>