Indentation change + small #ifndef NEW_INSETS fix.

[lyx.git] / src / Spacing.C

diff --git a/src/Spacing.C b/src/Spacing.C
index b80f55ffb13c554ac0c93cb5d9cb57fe198d2f47..832fe8f1e3d1897884a731aadfdb63e5e21ba08d 100644 (file)
--- 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);
 }