diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-24 14:54:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-24 14:54:51 +0200 |
| commit | 9703cc63cea3c47d13afe5f9b0eb22c631000958 (patch) | |
| tree | 65456e93a12de0f7f7303f7de7f72f683142b5e0 /mysqlc | |
| parent | b39a778b5efa73936893a91b3223bb350bae1fb2 (diff) | |
Remove o3tl/heap_ptr.hxx, use std::unique_ptr instead
Change-Id: Iac70c9be13892a36bfb5975f62e5345b88d4f144
Diffstat (limited to 'mysqlc')
| -rw-r--r-- | mysqlc/source/mysqlc_statement.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx index 60cc7f6b4efe..87ec8c547ce1 100644 --- a/mysqlc/source/mysqlc_statement.cxx +++ b/mysqlc/source/mysqlc_statement.cxx @@ -16,7 +16,12 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + +#include <sal/config.h> + +#include <memory> #include <stdio.h> + #include "mysqlc_connection.hxx" #include "mysqlc_propertyids.hxx" #include "mysqlc_resultset.hxx" @@ -32,7 +37,6 @@ #include <cppconn/exception.h> #include <cppconn/statement.h> #include <cppuhelper/typeprovider.hxx> -#include <o3tl/heap_ptr.hxx> #include <osl/diagnose.h> #include <osl/thread.h> @@ -180,7 +184,7 @@ Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery(const OUString& Reference< XResultSet > xResultSet; try { - o3tl::heap_ptr< sql::ResultSet > rset(cppStatement->executeQuery(OUStringToOString(sSqlStatement, m_pConnection->getConnectionEncoding()).getStr())); + std::unique_ptr< sql::ResultSet > rset(cppStatement->executeQuery(OUStringToOString(sSqlStatement, m_pConnection->getConnectionEncoding()).getStr())); xResultSet = new OResultSet(this, rset.get(), m_pConnection->getConnectionEncoding()); rset.release(); } catch (const sql::SQLException &e) { @@ -286,7 +290,7 @@ Reference< XResultSet > SAL_CALL OCommonStatement::getResultSet() Reference< XResultSet > xResultSet; try { - o3tl::heap_ptr< sql::ResultSet > rset(cppStatement->getResultSet()); + std::unique_ptr< sql::ResultSet > rset(cppStatement->getResultSet()); xResultSet = new OResultSet(this, rset.get(), m_pConnection->getConnectionEncoding()); rset.release(); } catch (const sql::SQLException &e) { |