Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
gautamp8 authored and Miklos Vajna committed Jun 3, 2017
1 parent a318fc4 commit a21ec27
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions configure.ac
Expand Up @@ -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

Expand Down
5 changes: 3 additions & 2 deletions connectivity/source/drivers/jdbc/JStatement.cxx
Expand Up @@ -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);
}

Expand Down

0 comments on commit a21ec27

Please sign in to comment.