diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-10-02 16:34:37 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-02 16:49:49 +0200 |
| commit | 0718498999a22c07e595217f0b370b9c39dcc1f2 (patch) | |
| tree | 7cb6ee972b736e869cd8a6e8ba167e9700efdde5 /connectivity | |
| parent | c6e2b7ac2ac02b714e4c3d894d68bc3e5f20f685 (diff) | |
Replace deprecated std::auto_ptr with boost::scoped_ptr
Change-Id: Ic55d1a8b14ec0355a6289007d954e89cd41c7486
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/jdbc/JConnection.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx index db94bbe18ba9..4c7a3a9ab0ae 100644 --- a/connectivity/source/drivers/jdbc/JConnection.cxx +++ b/connectivity/source/drivers/jdbc/JConnection.cxx @@ -17,7 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "sal/config.h" +#include "boost/scoped_ptr.hpp" #include "java/sql/Connection.hxx" #include "java/lang/Class.hxx" #include "java/tools.hxx" @@ -45,7 +47,6 @@ #include <unotools/confignode.hxx> #include <list> -#include <memory> using namespace connectivity; using namespace connectivity::jdbc; @@ -690,11 +691,11 @@ void java_sql_Connection::loadDriverFromProperties( const OUString& _sDriverClas { m_aLogger.log( LogLevel::INFO, STR_LOG_LOADING_DRIVER, _sDriverClass ); // the driver manager holds the class of the driver for later use - ::std::auto_ptr< java_lang_Class > pDrvClass; + boost::scoped_ptr< java_lang_Class > pDrvClass; if ( _sDriverClassPath.isEmpty() ) { // if forName didn't find the class it will throw an exception - pDrvClass = ::std::auto_ptr< java_lang_Class >(java_lang_Class::forName(_sDriverClass)); + pDrvClass.reset(java_lang_Class::forName(_sDriverClass)); } else { |