smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

remove assert()s from LocaleGuard

Browse source
This commit is contained in:
Robin Gareus 2016-05-05 20:29:28 +02:00
parent bb99df867f
commit 2624c0966b
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libs/pbd/locale_guard.cc
View file

@ -23,14 +23,12 @@
#include <locale.h> #include <locale.h>
#include "pbd/locale_guard.h" #include "pbd/locale_guard.h"
#include "pbd/error.h"
using namespace PBD; using namespace PBD;
/* The initial C++ locale is "C" regardless of the user's preferred locale. /* The initial C++ locale is "C" regardless of the user's preferred locale.
* and affects std::sprintf() et al from <cstdio> * The C locale from setlocale() matches the user's preferred locale
*
* the C locale from setlocale() matches the user's preferred locale
* and effects ::sprintf() et al from <stdio.h>
* *
* Setting the C++ locale will change the C locale, but not the other way 'round. * Setting the C++ locale will change the C locale, but not the other way 'round.
* and some plugin may change either behind our back. * and some plugin may change either behind our back.
@ -60,7 +58,9 @@ LocaleGuard::init ()
/* this changes both C++ and C locale */ /* this changes both C++ and C locale */
std::locale::global (std::locale (std::locale::classic(), "C", std::locale::numeric)); std::locale::global (std::locale (std::locale::classic(), "C", std::locale::numeric));
} }
assert (old_cpp == std::locale::classic ()); if (old_cpp != std::locale::classic ()) {
PBD::error << "LocaleGuard: initial C++ locale is not 'C'. Expect non-portable session files.\n";
}
} }
LocaleGuard::~LocaleGuard () LocaleGuard::~LocaleGuard ()
@ -75,7 +75,9 @@ LocaleGuard::~LocaleGuard ()
* *
* if it's not: some plugin meddled with it. * if it's not: some plugin meddled with it.
*/ */
assert (old_cpp == std::locale::classic ()); if (old_cpp != std::locale::classic ()) {
PBD::error << "LocaleGuard: someone (a plugin) changed the C++ locale, expect non-portable session files.\n";
}
std::locale::global (old_cpp); std::locale::global (old_cpp);
} }
if (old_c && strcmp (old_c, actual)) { if (old_c && strcmp (old_c, actual)) {