[Bf-blender-cvs] [f22385f28ec] blender2.8: I18n: tweak/fix exception catching code of pgettex() wrapper.

[Bastien Montagne]

Commit: f22385f28ec8b855f4ed84e94aa207986db6a09e
Author: Bastien Montagne
Date:   Tue Oct 23 14:34:38 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf22385f28ec8b855f4ed84e94aa207986db6a09e

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.

===================================================================

M	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<char_message_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<char_message_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;
 	}