diff options
| author | Machiavelli <machiavelli.trinity@gmail.com> | 2012-03-25 21:21:23 +0200 |
|---|---|---|
| committer | Machiavelli <machiavelli.trinity@gmail.com> | 2012-03-25 21:21:23 +0200 |
| commit | fa1d3f305b6a31c11b068a3d10924d2adc9d8279 (patch) | |
| tree | a5a6e09b15c1165c9eae3bdcffada4b50ad60de5 /src/server/shared/Database | |
| parent | 44a474f1e383152e205b031614d05d982f870e59 (diff) | |
Core/Misc: Implement Trinity::Auto_Ptr. Ditches ACE_Refcounted_AutoPtr (we strongly suspect it does NOT clean up the underlying pointer properly). Underlying type is now ACE_Strong_Bound_Ptr
Diffstat (limited to 'src/server/shared/Database')
| -rwxr-xr-x | src/server/shared/Database/QueryResult.h | 6 | ||||
| -rwxr-xr-x | src/server/shared/Database/Transaction.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/shared/Database/QueryResult.h b/src/server/shared/Database/QueryResult.h index 524532f30ec..2c09cb19c81 100755 --- a/src/server/shared/Database/QueryResult.h +++ b/src/server/shared/Database/QueryResult.h @@ -19,7 +19,7 @@ #ifndef QUERYRESULT_H #define QUERYRESULT_H -#include <ace/Refcounted_Auto_Ptr.h> +#include "AutoPtr.h" #include <ace/Thread_Mutex.h> #include "Field.h" @@ -58,7 +58,7 @@ class ResultSet MYSQL_FIELD* _fields; }; -typedef ACE_Refcounted_Auto_Ptr<ResultSet, ACE_Null_Mutex> QueryResult; +typedef Trinity::AutoPtr<ResultSet, ACE_Null_Mutex> QueryResult; class PreparedResultSet { @@ -103,7 +103,7 @@ class PreparedResultSet }; -typedef ACE_Refcounted_Auto_Ptr<PreparedResultSet, ACE_Null_Mutex> PreparedQueryResult; +typedef Trinity::AutoPtr<PreparedResultSet, ACE_Null_Mutex> PreparedQueryResult; #endif diff --git a/src/server/shared/Database/Transaction.h b/src/server/shared/Database/Transaction.h index 92002819951..a12f66ceced 100755 --- a/src/server/shared/Database/Transaction.h +++ b/src/server/shared/Database/Transaction.h @@ -47,7 +47,7 @@ class Transaction bool _cleanedUp; }; -typedef ACE_Refcounted_Auto_Ptr<Transaction, ACE_Null_Mutex> SQLTransaction; +typedef Trinity::AutoPtr<Transaction, ACE_Null_Mutex> SQLTransaction; /*! Low level class*/ class TransactionTask : public SQLOperation |