From f22385f28ec8b855f4ed84e94aa207986db6a09e Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 23 Oct 2018 14:34:38 +0200 Subject: I18n: tweak/fix exception catching code of pgettex() wrapper. Related to T57066, rather unlikely to fix core of the issue, but may solve crash itself. --- intern/locale/boost_locale_wrapper.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'intern/locale/boost_locale_wrapper.cpp') diff --git a/intern/locale/boost_locale_wrapper.cpp b/intern/locale/boost_locale_wrapper.cpp index 0707c0dd3e3..058b6e9f5d9 100644 --- a/intern/locale/boost_locale_wrapper.cpp +++ b/intern/locale/boost_locale_wrapper.cpp @@ -112,13 +112,17 @@ const char *bl_locale_pgettext(const char *msgctxt, const char *msgid) return r; return msgid; } - catch(std::bad_cast const &e) { /* if std::has_facet(l) == false, LC_ALL = "C" case */ -// std::cout << "bl_locale_pgettext(" << msgid << "): " << e.what() << " \n"; + catch(const std::bad_cast &e) { /* if std::has_facet(l) == false, LC_ALL = "C" case */ +#ifndef NDEBUG + std::cout << "bl_locale_pgettext(" << msgctxt << ", " << msgid << "): " << e.what() << " \n"; +#endif (void)e; return msgid; } - catch(std::exception const &e) { -// std::cout << "bl_locale_pgettext(" << msgctxt << ", " << msgid << "): " << e.what() << " \n"; + catch(const std::exception &e) { +#ifndef NDEBUG + std::cout << "bl_locale_pgettext(" << msgctxt << ", " << msgid << "): " << e.what() << " \n"; +#endif (void)e; return msgid; } -- cgit v1.2.3