X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSpacing.C;h=832fe8f1e3d1897884a731aadfdb63e5e21ba08d;hb=c90c5e6386ce69c34c99b3594d6fa452e6a13161;hp=b80f55ffb13c554ac0c93cb5d9cb57fe198d2f47;hpb=adaef99e60e28eba8c413a3472cc71e234718af0;p=lyx.git diff --git a/src/Spacing.C b/src/Spacing.C index b80f55ffb1..832fe8f1e3 100644 --- a/src/Spacing.C +++ b/src/Spacing.C @@ -22,8 +22,11 @@ using std::ios; using std::ostream; /// how can I put this inside of Spacing (class) -static -char const * spacing_string[] = {"single", "onehalf", "double", "other"}; +namespace { + +char const * const spacing_string[] = {"single", "onehalf", "double", "other"}; + +} // namespace anon float Spacing::getValue() const @@ -56,7 +59,7 @@ void Spacing::set(Spacing::Space sp, float val) void Spacing::set(Spacing::Space sp, string const & val) { float fval; - istringstream istr(val); + istringstream istr(val.c_str()); istr >> fval; set(sp, fval); }