* lily/note-column.cc: reformat.

[lilypond.git] / lily / object-key-undumper.cc

diff --git a/lily/object-key-undumper.cc b/lily/object-key-undumper.cc
index 59bcaa65b62ad5e2dfe53b65a1fb6c0fe803f62d..3aec3c5808d3abf2d434c51370a1d1f48af0e5e8 100644 (file)
--- a/lily/object-key-undumper.cc
+++ b/lily/object-key-undumper.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "object-key-undumper.hh"
@@ -19,9 +19,7 @@ Object_key_undumper::mark_smob (SCM smob)
   Object_key_undumper *undumper = (Object_key_undumper *) SCM_CELL_WORD_1 (smob);
   for (Int_to_key_map::const_iterator i (undumper->keys_.begin ());
        i != undumper->keys_.end (); i++)
-    {
-      scm_gc_mark ((*i).second->self_scm ());
-    }
+    scm_gc_mark ((*i).second->self_scm ());
 
   return SCM_BOOL_F;
 }
@@ -64,15 +62,13 @@ Object_key_undumper::parse_contents (SCM contents)
              *tail = scm_cons (key->self_scm (), SCM_EOL);
            }
          else
-           {
-             *tail = scm_cons (item, SCM_EOL);
-           }
+           *tail = scm_cons (item, SCM_EOL);
          tail = SCM_CDRLOC (*tail);
        }
 
       Object_key *k = Object_key::undump (new_key);
       keys_[number] = k;
-      scm_gc_unprotect_object (k->self_scm ());
+      k->unprotect ();
     }
 }