diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-14 14:43:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-14 19:32:42 +0000 |
| commit | 33cddeea1352688af9a42b53024e32a4536d5860 (patch) | |
| tree | c113962c0dd2a936b08ce0e64721f7b4617e757b /connectivity/source/commontools | |
| parent | f10691acf1be60167c042b4b4a60200b4defcd88 (diff) | |
boost->std
Change-Id: Iff14f69c200217c5d868978e8ffc06962b99ac09
Reviewed-on: https://gerrit.libreoffice.org/18568
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'connectivity/source/commontools')
| -rw-r--r-- | connectivity/source/commontools/RowFunctionParser.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/commontools/predicateinput.cxx | 7 |
2 files changed, 4 insertions, 5 deletions
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 <connectivity/PColumn.hxx> #include <comphelper/numbers.hxx> -#include <boost/scoped_ptr.hpp> -#include <boost/shared_ptr.hpp> +#include <memory> namespace dbtools @@ -319,7 +318,7 @@ namespace dbtools { // first try the international version OUString sSql = "SELECT * FROM x WHERE " + sField + _rPredicateValue; - boost::scoped_ptr<OSQLParseNode> pParseNode( const_cast< OSQLParser& >( m_aParser ).parseTree( sError, sSql, true ) ); + std::unique_ptr<OSQLParseNode> 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<OSQLParseNode> xTakeOwnership(pParseNode); + std::shared_ptr<OSQLParseNode> xTakeOwnership(pParseNode); OSQLParseNode* pOdbcSpec = pParseNode->getByRule( OSQLParseNode::odbc_fct_spec ); if ( pOdbcSpec ) { |