allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Fix unnecessary const violation.

Browse Source
This commit is contained in:
David Robillard
2015-02-27 04:52:40 -05:00
parent e77e7f1f3d
commit 933e9c2919
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/pbd/localeguard.cc
View File

@@ -10,13 +10,14 @@
std::string PBD::LocaleGuard::current;
PBD::LocaleGuard::LocaleGuard (const char* str)
: old(0)
: old(0)
{
if (current != str) {
old = strdup (setlocale (LC_NUMERIC, NULL));
if (strcmp (old, str)) {
if (setlocale (LC_NUMERIC, str))
current = str;
if (setlocale (LC_NUMERIC, str)) {
current = str;
}
}
}
}
@@ -24,10 +25,11 @@ PBD::LocaleGuard::LocaleGuard (const char* str)
PBD::LocaleGuard::~LocaleGuard ()
{
if (old) {
if (setlocale (LC_NUMERIC, old))
if (setlocale (LC_NUMERIC, old)) {
current = old;
}
free ((char*)old);
free (old);
}
}

4
libs/pbd/pbd/locale_guard.h
View File

@@ -29,9 +29,11 @@ namespace PBD {
struct LIBPBD_API LocaleGuard {
LocaleGuard (const char*);
~LocaleGuard ();
const char* old;
static std::string current;
private:
char* old;
};
}