android: Fix build with NDK 26 #674
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
While the workarounds added in
commit df0b921
Author: axxel <awagger@gmail.com>
Date: Thu Dec 15 20:43:48 2022 +0100
android: work around limitations of c++-20 support in NDK
may be necessary for NDK 25, they are no longer for NDK 26,
and even break the build with NDK 26:
C/C++: .../zxing-cpp/core/src/Generator.h:103:7: error: reference to 'default_sentinel_t' is ambiguous
C/C++: std::default_sentinel_t end() { return {}; }
C/C++: ^
C/C++: .../Android/Sdk/ndk/26.1.10909125/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/c++/v1/__iterator/default_sentinel.h:23:8: note: candidate found by name lookup is 'std::__ndk1::default_sentinel_t'
C/C++: struct default_sentinel_t { };
C/C++: ^
C/C++: .../zxing-cpp/core/src/Generator.h:15:9: note: candidate found by name lookup is 'std::default_sentinel_t'
C/C++: struct default_sentinel_t {};
C/C++: ^
C/C++: 2 errors generated.
Restrict the workaround to NDK version < 26 to fix this.
Fixes: #673
tdf-gerrit
pushed a commit
to LibreOffice/core
that referenced
this pull request
Nov 28, 2023
Upstream issue/PR/commit: zxing-cpp/zxing-cpp#673 zxing-cpp/zxing-cpp#674 zxing-cpp/zxing-cpp@295b193 Change-Id: I47586e0e54b3661e4ca1b5c071f6595fd000cc70 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159999 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While the workarounds added in
may be necessary for NDK 25, they are no longer for NDK 26, and even break the build with NDK 26:
Restrict the workaround to NDK version < 26 to fix this.
Fixes: #673