[Libreoffice-commits] core.git: configure.ac connectivity/source

[brainbreaker]

 configure.ac                                    |    6 +++---
 connectivity/source/drivers/jdbc/JStatement.cxx |    5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit a21ec27fe5d8de3455522deeedc2dc43cb41c073
Author: brainbreaker <gautamprajapati06 at gmail.com>
Date:   Fri Jun 2 22:01:25 2017 +0530

    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 at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/configure.ac b/configure.ac
index d920cfaef5e3..24df1493171d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -382,11 +382,11 @@ if test -n "$with_android_ndk"; then
     case $ANDROID_NDK_VERSION in
     r9*|r10*)
         ;;
-    11.1.*|12.1.*|13.1.*)
+    11.1.*|12.1.*|13.1.*|14.1.*)
         ;;
     *)
-        AC_MSG_WARN([Untested android NDK version $ANDROID_NDK_VERSION, only versions r9* til 13.1.* have been used successfully. Proceed at your own risk.])
-        add_warning "Untested android NDK version $ANDROID_NDK_VERSION, only versions r9* til 13.1.* have been used successfully. Proceed at your own risk."
+        AC_MSG_WARN([Untested android NDK version $ANDROID_NDK_VERSION, only versions r9* til 14.1.* have been used successfully. Proceed at your own risk.])
+        add_warning "Untested android NDK version $ANDROID_NDK_VERSION, only versions r9* til 14.1.* have been used successfully. Proceed at your own risk."
         ;;
     esac
 
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);
     }