Core/DBLayer:

* Rename QueryResult class to ResultSet
* Rename QueryResult_AutoPtr to QueryResult
* Declare ACE refcounted auto pointer for PreparedResultSet class

--HG--
branch : trunk

1 files changed, 4 insertions, 4 deletions

diff --git a/src/server/shared/Database/SQLOperation.h b/src/server/shared/Database/SQLOperation.h
index 0c5fe08d94e..976e458a4f2 100644
--- a/src/server/shared/Database/SQLOperation.h
+++ b/src/server/shared/Database/SQLOperation.h
@@ -42,7 +42,7 @@ class SQLOperation : public ACE_Method_Request
         MySQLConnection* m_conn;
 };
 
-typedef ACE_Future<QueryResult_AutoPtr> QueryResultFuture;
+typedef ACE_Future<QueryResult> QueryResultFuture;
 /*! Raw, ad-hoc query. */
 class BasicStatementTask :  public SQLOperation
 {
@@ -65,7 +65,7 @@ class SQLQueryHolder
 {
     friend class SQLQueryHolderTask;
     private:
-        typedef std::pair<const char*, QueryResult_AutoPtr> SQLResultPair;
+        typedef std::pair<const char*, QueryResult> SQLResultPair;
         std::vector<SQLResultPair> m_queries;
     public:
         SQLQueryHolder() {}
@@ -73,8 +73,8 @@ class SQLQueryHolder
         bool SetQuery(size_t index, const char *sql);
         bool SetPQuery(size_t index, const char *format, ...) ATTR_PRINTF(3,4);
         void SetSize(size_t size);
-        QueryResult_AutoPtr GetResult(size_t index);
-        void SetResult(size_t index, QueryResult_AutoPtr result);
+        QueryResult GetResult(size_t index);
+        void SetResult(size_t index, QueryResult result);
 };
 
 typedef ACE_Future<SQLQueryHolder*> QueryResultHolderFuture;