@@ -18,17 +18,17 @@ using namespace std;
1818using namespace pqxx ;
1919
2020template <class T >
21- class unique_ptr
21+ class my_unique_ptr
2222{
2323 T* ptr;
2424
2525public:
26- unique_ptr (T* p =NULL ) : ptr(p) {}
27- ~unique_ptr () {delete ptr; }
26+ my_unique_ptr (T* p =NULL ) : ptr(p) {}
27+ ~my_unique_ptr () {delete ptr; }
2828 T&operator *() {return *ptr; }
2929 T*operator ->() {return ptr; }
3030void operator =(T* p) { ptr = p; }
31- void operator =(unique_ptr & other) {
31+ void operator =(my_unique_ptr & other) {
3232 ptr = other.ptr ;
3333 other.ptr =NULL ;
3434 }
@@ -115,7 +115,7 @@ xid_t execQuery( transaction_base& txn, char const* sql, ...)
115115void *reader (void * arg)
116116{
117117 thread& t = *(thread*)arg;
118- vector<unique_ptr <connection> >conns (cfg.connections .size ());
118+ vector<my_unique_ptr <connection> >conns (cfg.connections .size ());
119119for (size_t i =0 ; i < conns.size (); i++) {
120120 conns[i] =new connection (cfg.connections [i]);
121121 }
@@ -132,8 +132,8 @@ void* reader(void* arg)
132132 }
133133 txn.commit ();
134134 }
135- vector<unique_ptr <nontransaction> >txns (conns.size ());
136- vector<
unique_ptr <pipeline> >
pipes (conns.
size ());
135+ vector<my_unique_ptr <nontransaction> >txns (conns.size ());
136+ vector<
my_unique_ptr <pipeline> >
pipes (conns.
size ());
137137 vector<pipeline::query_id>results (conns.size ());
138138for (size_t i =0 ; i < conns.size (); i++) {
139139 txns[i] =new nontransaction (*conns[i]);
@@ -196,8 +196,10 @@ void* writer(void* arg)
196196
197197 pipelinesrcPipe (srcTx);
198198 pipelinedstPipe (dstTx);
199+
199200 srcPipe.insert (" commit transaction"
200201 dstPipe.insert (" commit transaction"
202+
201203 srcPipe.complete ();
202204 dstPipe.complete ();
203205