0005-domtestcase.cpp-fix-narrowing-conversion-compile-err.patch 1.9 KB

123456789101112131415161718192021222324252627282930313233343536
  1. From afc191aec355619d6ebabb2cad660a5a8ad4569b Mon Sep 17 00:00:00 2001
  2. From: Peter Korsgaard <peter@korsgaard.com>
  3. Date: Mon, 30 Jan 2017 23:13:43 +0100
  4. Subject: [PATCH] domtestcase.cpp: fix narrowing conversion compile error with
  5. gcc 6+ / signed char
  6. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  7. ---
  8. src/test/cpp/xml/domtestcase.cpp | 4 ++--
  9. 1 file changed, 2 insertions(+), 2 deletions(-)
  10. diff --git a/src/test/cpp/xml/domtestcase.cpp b/src/test/cpp/xml/domtestcase.cpp
  11. index ad276d1a..2a1e6e2e 100644
  12. --- a/src/test/cpp/xml/domtestcase.cpp
  13. +++ b/src/test/cpp/xml/domtestcase.cpp
  14. @@ -190,7 +190,7 @@ public:
  15. DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml"));
  16. LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3")
  17. #if LOG4CXX_LOGCHAR_IS_UTF8
  18. - const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 };
  19. + const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast<logchar>(0xC2), static_cast<logchar>(0xB3), 0 };
  20. #else
  21. const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 };
  22. #endif
  23. @@ -209,7 +209,7 @@ public:
  24. DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml"));
  25. LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4")
  26. #if LOG4CXX_LOGCHAR_IS_UTF8
  27. - const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 };
  28. + const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast<logchar>(0xE3), static_cast<logchar>(0x86), static_cast<logchar>(0x95), 0 };
  29. #else
  30. const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 };
  31. #endif
  32. --
  33. 2.11.0