summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-02-18 17:18:15 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-02-18 20:43:16 +0000
commit6106d99a905883c7325dae252b8b071be1896641 (patch)
treebdfc25a94cf1e34f605d1d0dfd4439c80fa8996d /connectivity
parentf7f5fa0d36571b5103a54ed1281668cd23c4ecbc (diff)
boost->std
Change-Id: Ifa87783f68b0fab98f8a0f7cd6ed867202b4532f
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/parse/sqliterator.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 2e668e19b0a2..dbe05776d656 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -40,7 +40,7 @@
#include <iterator>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::comphelper;
using namespace ::connectivity;
@@ -65,9 +65,9 @@ namespace connectivity
Reference< XNameAccess > m_xTableContainer;
Reference< XNameAccess > m_xQueryContainer;
- ::boost::shared_ptr< OSQLTables > m_pTables; // all tables which participate in the SQL statement
- ::boost::shared_ptr< OSQLTables > m_pSubTables; // all tables from sub queries not the tables from the select tables
- ::boost::shared_ptr< QueryNameSet > m_pForbiddenQueryNames;
+ std::shared_ptr< OSQLTables > m_pTables; // all tables which participate in the SQL statement
+ std::shared_ptr< OSQLTables > m_pSubTables; // all tables from sub queries not the tables from the select tables
+ std::shared_ptr< QueryNameSet > m_pForbiddenQueryNames;
sal_uInt32 m_nIncludeMask;
@@ -114,7 +114,7 @@ namespace connectivity
*/
class ForbidQueryName
{
- ::boost::shared_ptr< QueryNameSet >& m_rpAllForbiddenNames;
+ std::shared_ptr< QueryNameSet >& m_rpAllForbiddenNames;
OUString m_sForbiddenQueryName;
public:
@@ -332,7 +332,7 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQu
break;
OUString sError;
- boost::scoped_ptr< OSQLParseNode > pSubQueryNode( const_cast< OSQLParser& >( m_rParser ).parseTree( sError, sSubQueryCommand, false ) );
+ std::unique_ptr< OSQLParseNode > pSubQueryNode( const_cast< OSQLParser& >( m_rParser ).parseTree( sError, sSubQueryCommand, false ) );
if ( !pSubQueryNode.get() )
break;