package/cegui: fix invalid cast
PATCH 1/1 package/cegui: fix invalid cast
Fixes:
- http://autobuild.buildroot.net/results/a76/a76e88d1805c836bf095b9b6ed5fb52aa0fcdc0a
- http://autobuild.buildroot.net/results/d24/d24ebb999215a23e0743c29ca137745417316bc4
- http://autobuild.buildroot.net/results/37b/37b46d25a98a17ead9133cba9fd6c8ebe8996d60
and many many more...
--- ...tringTranscoder.cpp-use-cast-notatio.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/cegui/0002-cegui-src-IconvStringTranscoder.cpp-use-cast-notatio.patch
package/cegui/0002-cegui-src-IconvStringTranscoder.cpp-use-cast-notatio.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 4561bac9dddad8fd79e746ea1ddd89c20647a162 Mon Sep 17 00:00:00 2001 +From: Bartosz Bilas <[email protected]> +Date: Thu, 2 Apr 2020 18:04:28 +0200 +Subject: [PATCH 1/1] cegui/src/IconvStringTranscoder.cpp: use cast notation + instead of reinterpret_cast + +Fixes: + IconvStringTranscoder.cpp:50:49: error: invalid cast from type 'int' to + type 'iconv_t' {aka 'long int'} + if (d_cd == reinterpret_cast<iconv_t>(-1)) + +Signed-off-by: Bartosz Bilas <[email protected]> +--- + Upstream status: https://github.com/cegui/cegui/pull/1194 + + cegui/src/IconvStringTranscoder.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cegui/src/IconvStringTranscoder.cpp b/cegui/src/IconvStringTranscoder.cpp +index 1a5df2995..f6b5aa816 100644 +--- a/cegui/src/IconvStringTranscoder.cpp ++++ b/cegui/src/IconvStringTranscoder.cpp +@@ -47,7 +47,7 @@ public: + d_toCode(tocode), + d_cd(iconv_open(d_toCode.c_str(), d_fromCode.c_str())) + { +- if (d_cd == reinterpret_cast<iconv_t>(-1)) ++ if (d_cd == (iconv_t)(-1)) + CEGUI_THROW(InvalidRequestException(String( + "Failed to create conversion descriptor from \"") + + d_fromCode.c_str() + "\" to \"" + d_toCode.c_str() + "\".")); +-- +2.26.0 +
Signature · 1 line
2.26.0
PATCH 1/1 package/cegui: fix invalid cast
Quoted 23 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bartosz" == Bartosz Bilas <[email protected]> writes:
Fixes:
- http://autobuild.buildroot.net/results/a76/a76e88d1805c836bf095b9b6ed5fb52aa0fcdc0a
- http://autobuild.buildroot.net/results/d24/d24ebb999215a23e0743c29ca137745417316bc4
- http://autobuild.buildroot.net/results/37b/37b46d25a98a17ead9133cba9fd6c8ebe8996d60and many many more...
Signed-off-by Bartosz Bilas <[email protected]>--- ...tringTranscoder.cpp-use-cast-notatio.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/cegui/0002-cegui-src-IconvStringTranscoder.cpp-use-cast-notatio.patchdiff --git
a/package/cegui/0002-cegui-src-IconvStringTranscoder.cpp-use-cast-notatio.patchb/package/cegui/0002-cegui-src-IconvStringTranscoder.cpp-use-cast-notatio.patchnew file mode 100644
index 0000000000..4dbdafb079
package/cegui/0002-cegui-src-IconvStringTranscoder.cpp-use-cast-notatio.patch line 4
Quoted 4 lines
package/cegui/0002-cegui-src-IconvStringTranscoder.cpp-use-cast-notatio.patch new file +4
-0@@ -0,0 +1,34 @@ +From 4561bac9dddad8fd79e746ea1ddd89c20647a162 Mon Sep 17 00:00:00 2001 +From: Bartosz Bilas <[email protected]> +Date: Thu, 2 Apr 2020 18:04:28 +0200 +Subject: [PATCH 1/1] cegui/src/IconvStringTranscoder.cpp: use cast notation
Please use the -N option to git format-patch to get rid of the 1/1 as pointed out by check-package:
package/cegui/0002-cegui-src-IconvStringTranscoder.cpp-use-cast-notatio.patch:4: generate your patches with 'git format-patch -N'
Committed with that fixed, thanks. Do not forget to submit the patch upstream.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 package/cegui: fix invalid cast
Hi Peter,
Quoted 30 lines · Peter Korsgaard
Quoted 22 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bartosz" == Bartosz Bilas <[email protected]> writes:
Fixes:
- http://autobuild.buildroot.net/results/a76/a76e88d1805c836bf095b9b6ed5fb52aa0fcdc0a
- http://autobuild.buildroot.net/results/d24/d24ebb999215a23e0743c29ca137745417316bc4
- http://autobuild.buildroot.net/results/37b/37b46d25a98a17ead9133cba9fd6c8ebe8996d60and many many more...
Signed-off-by Bartosz Bilas <[email protected]>--- ...tringTranscoder.cpp-use-cast-notatio.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/cegui/0002-cegui-src-IconvStringTranscoder.cpp-use-cast-notatio.patchdiff --git
a/package/cegui/0002-cegui-src-IconvStringTranscoder.cpp-use-cast-notatio.patchb/package/cegui/0002-cegui-src-IconvStringTranscoder.cpp-use-cast-notatio.patchnew file mode 100644
index 0000000000..4dbdafb079package/cegui/0002-cegui-src-IconvStringTranscoder.cpp-use-cast-notatio.patch line 4
Quoted 4 lines
package/cegui/0002-cegui-src-IconvStringTranscoder.cpp-use-cast-notatio.patch new file +4
-0@@ -0,0 +1,34 @@ +From 4561bac9dddad8fd79e746ea1ddd89c20647a162 Mon Sep 17 00:00:00 2001 +From: Bartosz Bilas <[email protected]> +Date: Thu, 2 Apr 2020 18:04:28 +0200 +Subject: [PATCH 1/1] cegui/src/IconvStringTranscoder.cpp: use cast notationPlease use the -N option to git format-patch to get rid of the 1/1 as pointed out by check-package:
Quoted 1 line
package/cegui/0002-cegui-src-IconvStringTranscoder.cpp-use-cast-notatio.patch:4: generate your patches with 'git format-patch -N'
I'll keep it in my mind ;)
Quoted 4 lines
Committed with that fixed, thanks. Do not forget to submit the patch upstream.
That's already done.
Best
Bartek