0002-cegui-src-IconvStringTranscoder.cpp-use-cast-notatio.patch 1.2 KB

12345678910111213141516171819202122232425262728293031323334
  1. From 4561bac9dddad8fd79e746ea1ddd89c20647a162 Mon Sep 17 00:00:00 2001
  2. From: Bartosz Bilas <b.bilas@grinn-global.com>
  3. Date: Thu, 2 Apr 2020 18:04:28 +0200
  4. Subject: [PATCH] cegui/src/IconvStringTranscoder.cpp: use cast notation
  5. instead of reinterpret_cast
  6. Fixes:
  7. IconvStringTranscoder.cpp:50:49: error: invalid cast from type 'int' to
  8. type 'iconv_t' {aka 'long int'}
  9. if (d_cd == reinterpret_cast<iconv_t>(-1))
  10. Signed-off-by: Bartosz Bilas <b.bilas@grinn-global.com>
  11. ---
  12. Upstream status: https://github.com/cegui/cegui/pull/1194
  13. cegui/src/IconvStringTranscoder.cpp | 2 +-
  14. 1 file changed, 1 insertion(+), 1 deletion(-)
  15. diff --git a/cegui/src/IconvStringTranscoder.cpp b/cegui/src/IconvStringTranscoder.cpp
  16. index 1a5df2995..f6b5aa816 100644
  17. --- a/cegui/src/IconvStringTranscoder.cpp
  18. +++ b/cegui/src/IconvStringTranscoder.cpp
  19. @@ -47,7 +47,7 @@ public:
  20. d_toCode(tocode),
  21. d_cd(iconv_open(d_toCode.c_str(), d_fromCode.c_str()))
  22. {
  23. - if (d_cd == reinterpret_cast<iconv_t>(-1))
  24. + if (d_cd == (iconv_t)(-1))
  25. CEGUI_THROW(InvalidRequestException(String(
  26. "Failed to create conversion descriptor from \"") +
  27. d_fromCode.c_str() + "\" to \"" + d_toCode.c_str() + "\"."));
  28. --
  29. 2.26.0