diff options
| author | brainbreaker <gautamprajapati06@gmail.com> | 2017-06-02 22:01:25 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-06-03 23:01:13 +0200 |
| commit | a21ec27fe5d8de3455522deeedc2dc43cb41c073 (patch) | |
| tree | 5faf09ebe6f3636350d066ce9623c03d11371b30 /connectivity | |
| parent | a318fc479cf7255a7fdf12f578b8c3199eda5367 (diff) | |
android: Update configure.ac for NDK r14b version
This commits updates the NDK version warning
in confiure.ac for NDK r14b as it is now tested
for building Android.
Also, Modify code in JStatement.cxx to suppress the warning
of ignoring return value which turns into error with
--enable-werror argument.
Change-Id: I40b264c2f39788948dbf947073de63c3347184f9
Reviewed-on: https://gerrit.libreoffice.org/38359
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/jdbc/JStatement.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index 24a0910f6910..275dfcaeb7e9 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -133,8 +133,9 @@ Sequence< Type > SAL_CALL java_sql_Statement_Base::getTypes( ) Sequence< Type > aOldTypes = java_sql_Statement_BASE::getTypes(); if ( m_pConnection.is() && !m_pConnection->isAutoRetrievingEnabled() ) { - std::remove(aOldTypes.getArray(),aOldTypes.getArray() + aOldTypes.getLength(), - cppu::UnoType<XGeneratedResultSet>::get()); + auto it = std::remove(aOldTypes.getArray(),aOldTypes.getArray() + aOldTypes.getLength(), + cppu::UnoType<XGeneratedResultSet>::get()); + (void)it; aOldTypes.realloc(aOldTypes.getLength() - 1); } |