we always only use the "C" locale when saving.

[ardour.git] / libs / pbd / locale_guard.cc

diff --git a/libs/pbd/locale_guard.cc b/libs/pbd/locale_guard.cc
index c0d351febf0214834406fb99e9d56c3965690c58..8007ea001b60c7fcd9b7d24f07ad559146d6b400 100644 (file)
--- a/libs/pbd/locale_guard.cc
+++ b/libs/pbd/locale_guard.cc
@@ -23,41 +23,32 @@
 #include <locale.h>
 
 #include "pbd/locale_guard.h"
+#include "pbd/error.h"
 
 using namespace PBD;
 
-/* The initial C++ locate is "C" regardless of the user's preferred locale.
- * and affects std::sprintf() et al from <cstdio>
- *
- * the C locale from stlocale() matches the user's preferred locale
- * and effects ::sprintf() et al from <stdio.h>
+/* The initial C++ locale is "C" regardless of the user's preferred locale.
+ * The C locale from setlocale() matches the user's preferred locale
  *
  * Setting the C++ locale will change the C locale, but not the other way 'round.
  * and some plugin may change either behind our back.
  */
 
-LocaleGuard::LocaleGuard (const char*)
-       : old_c (0)
-{
-       init ();
-}
-
 LocaleGuard::LocaleGuard ()
        : old_c (0)
-{
-       init ();
-}
-
-void
-LocaleGuard::init ()
 {
        char* actual = setlocale (LC_NUMERIC, NULL);
        if (strcmp ("C", actual)) {
+               /* purpose of LocaleGuard is to make sure we're using "C" for
+                  the numeric locale during its lifetime, so make it so.
+               */
                old_c = strdup (actual);
                /* this changes both C++ and C locale */
                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 ()
@@ -67,10 +58,14 @@ LocaleGuard::~LocaleGuard ()
 
        if (current != old_cpp) {
                /* the C++ locale should always be "C", that's the default
-                * at application start, and ardour never changes it
+                * at application start, and ardour never changes it to
+                * anything but "C".
+                *
                 * 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);
        }
        if (old_c && strcmp (old_c, actual)) {