From 33cddeea1352688af9a42b53024e32a4536d5860 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 14 Sep 2015 14:43:18 +0100 Subject: boost->std MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iff14f69c200217c5d868978e8ffc06962b99ac09 Reviewed-on: https://gerrit.libreoffice.org/18568 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- connectivity/source/commontools/RowFunctionParser.cxx | 2 +- connectivity/source/commontools/predicateinput.cxx | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'connectivity/source/commontools') diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx index 7efeb9cd3a32..743a8b1eb4a1 100644 --- a/connectivity/source/commontools/RowFunctionParser.cxx +++ b/connectivity/source/commontools/RowFunctionParser.cxx @@ -142,7 +142,7 @@ struct ParserContext OperandStack maOperandStack; }; -typedef ::boost::shared_ptr< ParserContext > ParserContextSharedPtr; +typedef std::shared_ptr< ParserContext > ParserContextSharedPtr; /** Generate apriori constant value */ diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx index 5dd5a377364e..ec6227951485 100644 --- a/connectivity/source/commontools/predicateinput.cxx +++ b/connectivity/source/commontools/predicateinput.cxx @@ -31,8 +31,7 @@ #include #include -#include -#include +#include namespace dbtools @@ -319,7 +318,7 @@ namespace dbtools { // first try the international version OUString sSql = "SELECT * FROM x WHERE " + sField + _rPredicateValue; - boost::scoped_ptr pParseNode( const_cast< OSQLParser& >( m_aParser ).parseTree( sError, sSql, true ) ); + std::unique_ptr pParseNode( const_cast< OSQLParser& >( m_aParser ).parseTree( sError, sSql, true ) ); nType = DataType::DOUBLE; if ( pParseNode.get() ) { @@ -390,7 +389,7 @@ namespace dbtools else { OUString sReturn; - boost::shared_ptr xTakeOwnership(pParseNode); + std::shared_ptr xTakeOwnership(pParseNode); OSQLParseNode* pOdbcSpec = pParseNode->getByRule( OSQLParseNode::odbc_fct_spec ); if ( pOdbcSpec ) { -- cgit