diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-05 20:54:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-05 22:21:49 +0000 |
| commit | 4d6a509efe6bd56613b5554556d3a4f7f4cfd0d5 (patch) | |
| tree | 22fc10679131c72993615d0fa634460d14a15ec8 /connectivity | |
| parent | Related tdf#87356: import data bar [non-]gradient from OOXML (diff) | |
| download | core-4d6a509efe6bd56613b5554556d3a4f7f4cfd0d5.tar.gz core-4d6a509efe6bd56613b5554556d3a4f7f4cfd0d5.zip | |
convert all remaining BOOST_STATIC_ASSERT to static_assert
and we can include a few less headers
Change-Id: Id742849ff4c1c37a2b861aa3d6ab823f00ea87f8
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/odbc/OPreparedStatement.cxx | 7 | ||||
| -rw-r--r-- | connectivity/source/parse/sqlnode.cxx | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx index 82f5c984b282..47ebd57033d7 100644 --- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx @@ -333,7 +333,7 @@ void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_ * * Our internal OUString storage is always UTF-16, so no conversion to do here. */ - BOOST_STATIC_ASSERT(sizeof (SQLWCHAR) == 2 || sizeof (SQLWCHAR) == 4); + static_assert(sizeof (SQLWCHAR) == 2 || sizeof (SQLWCHAR) == 4, "must be 2 or 4"); if (sizeof (SQLWCHAR) == 2) { nCharLen = _sData.getLength(); @@ -414,17 +414,12 @@ void SAL_CALL OPreparedStatement::setByte( const sal_Int32 parameterIndex, const setScalarParameter(parameterIndex, DataType::TINYINT, 3, x); } -// For older compilers (that do not support partial specialisation of class templates) -// uncomment if necessary (safe also on compilers that *do* support partial specialisation) -//BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(DATE_STRUCT); -//BOOST_STATIC_ASSERT((boost::is_same<DATE_STRUCT, boost::remove_reference<DATE_STRUCT&>::type>::value)); void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& aData ) throw(SQLException, RuntimeException, std::exception) { DATE_STRUCT x(OTools::DateToOdbcDate(aData)); setScalarParameter<DATE_STRUCT&>(parameterIndex, DataType::DATE, 10, x); } - void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& aVal ) throw(SQLException, RuntimeException, std::exception) { SQLULEN nColSize; diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 6f674fc68c6d..2c005160fae4 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -1456,7 +1456,7 @@ OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star: const size_t nRuleMapCount = sizeof( aRuleDescriptions ) / sizeof( aRuleDescriptions[0] ); // added a new rule? Adjust this map! // +1 for UNKNOWN_RULE - BOOST_STATIC_ASSERT( nRuleMapCount + 1 == static_cast<size_t>(OSQLParseNode::rule_count) ); + static_assert(nRuleMapCount + 1 == static_cast<size_t>(OSQLParseNode::rule_count), "must be equal"); for ( size_t mapEntry = 0; mapEntry < nRuleMapCount; ++mapEntry ) { |