Skip to content

Commit 27c9e21

Browse files
committed
m87 c++ code fix for clang 16.0.6 and libstdc++ 13.1.1
Actual error: [722/1145] compile ../../src/utils/SkParseColor.cpp FAILED: obj/src/utils/libskia.SkParseColor.o /usr/bin/clang++ -MD -MF obj/src/utils/libskia.SkParseColor.o.d -DNDEBUG -DSKIA_DLL -DSK_R32_SHIFT=16 -DSK_GAMMA_APPLY_TO_A8 -DSKIA_IMPLEMENTATION=1 -DSK_GL -DSK_SUPPORT_PDF -DSK_CODEC_DECODES_JPEG -DSK_ENCODE_JPEG -DSK_USE_LIBGIFCODEC -DSK_CODEC_DECODES_PNG -DSK_ENCODE_PNG -DSK_CODEC_DECODES_RAW -DSK_CODEC_DECODES_WEBP -DSK_ENCODE_WEBP -DSK_XML -I../.. -I../.. -I../../third_party/externals/libgifcodec -Wno-attributes -fstrict-aliasing -fPIC -fvisibility=hidden -O3 -fdata-sections -ffunction-sections -Wno-sign-conversion -Wno-unused-parameter -std=c++17 -fvisibility-inlines-hidden -fno-exceptions -fno-rtti -c ../../src/utils/SkParseColor.cpp -o obj/src/utils/libskia.SkParseColor.o ../../src/utils/SkParseColor.cpp:300:39: error: no matching function for call to 'begin' const auto rec = std::lower_bound(std::begin(gColorNames), ^~~~~~~~~~ /usr/bin/../lib/gcc/x86_64-redhat-linux/13/../../../../include/c++/13/initializer_list:88:5: note: candidate template ignored: could not match 'initializer_list<_Tp>' against 'const char *const *' begin(initializer_list<_Tp> __ils) noexcept ^ ../../src/utils/SkParseColor.cpp:301:39: error: no matching function for call to 'end' std::end (gColorNames), ^~~~~~~~ /usr/bin/../lib/gcc/x86_64-redhat-linux/13/../../../../include/c++/13/initializer_list:99:5: note: candidate template ignored: could not match 'initializer_list<_Tp>' against 'const char *const *' end(initializer_list<_Tp> __ils) noexcept ^ ../../src/utils/SkParseColor.cpp:307:16: error: no matching function for call to 'end' if (rec == std::end(gColorNames) || 0 != strcmp(name, *rec)) { ^~~~~~~~ /usr/bin/../lib/gcc/x86_64-redhat-linux/13/../../../../include/c++/13/initializer_list:99:5: note: candidate template ignored: could not match 'initializer_list<_Tp>' against 'const char *const *' end(initializer_list<_Tp> __ils) noexcept ^ 3 errors generated. Signed-off-by: Hin-Tak Leung <[email protected]>
1 parent 1bc54e0 commit 27c9e21

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

patch/skia-m87-c++-code.diff

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/src/utils/SkParseColor.cpp b/src/utils/SkParseColor.cpp
2+
index 7260365..df53d2b 100644
3+
--- a/src/utils/SkParseColor.cpp
4+
+++ b/src/utils/SkParseColor.cpp
5+
@@ -6,6 +6,7 @@
6+
*/
7+
8+
9+
+#include <vector>
10+
#include "include/utils/SkParse.h"
11+
12+
static constexpr const char* gColorNames[] = {

0 commit comments

Comments
 (0)