diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:00:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:01:05 +0100 |
| commit | 871426533f7afe31bc451fa6b407b83db8e52827 (patch) | |
| tree | ed60cee61ebee91994eaffc9c9a3638836ed2ab4 /connectivity | |
| parent | 5a849bb5317ad73bb43b2b618b14bc0e8751fff6 (diff) | |
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/commontools/predicateinput.cxx | 5 | ||||
| -rw-r--r-- | connectivity/source/simpledbt/dbtfactory.cxx | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx index 06c743d65561..d315aa52530b 100644 --- a/connectivity/source/commontools/predicateinput.cxx +++ b/connectivity/source/commontools/predicateinput.cxx @@ -28,6 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" + #include <connectivity/predicateinput.hxx> #include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> @@ -38,6 +39,8 @@ #include <connectivity/PColumn.hxx> #include <comphelper/numbers.hxx> +#include <boost/shared_ptr.hpp> + //......................................................................... namespace dbtools { @@ -394,7 +397,7 @@ namespace dbtools ::rtl::OUString sReturn; if ( pParseNode ) { - ::std::auto_ptr<OSQLParseNode> pTemp(pParseNode); + boost::shared_ptr<OSQLParseNode> xTakeOwnership(pParseNode); OSQLParseNode* pOdbcSpec = pParseNode->getByRule( OSQLParseNode::odbc_fct_spec ); if ( pOdbcSpec ) { diff --git a/connectivity/source/simpledbt/dbtfactory.cxx b/connectivity/source/simpledbt/dbtfactory.cxx index d3e8f52afb3a..89f457c6f302 100644 --- a/connectivity/source/simpledbt/dbtfactory.cxx +++ b/connectivity/source/simpledbt/dbtfactory.cxx @@ -95,12 +95,14 @@ namespace connectivity } //---------------------------------------------------------------- + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ::dbtools::FormattedColumnValue > ODataAccessToolsFactory::createFormattedColumnValue( const ::comphelper::ComponentContext& _rContext, const Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet, const Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn ) { ::std::auto_ptr< ::dbtools::FormattedColumnValue > pValue( new ::dbtools::FormattedColumnValue( _rContext, _rxRowSet, _rxColumn ) ); return pValue; } + SAL_WNODEPRECATED_DECLARATIONS_POP //---------------------------------------------------------------- ::rtl::Reference< simple::ISQLParser > ODataAccessToolsFactory::createSQLParser(const Reference< XMultiServiceFactory >& _rxServiceFactory,const IParseContext* _pContext) const |