X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprotected-scm.cc;h=ccb91ab08777d182274c23a235007521de295635;hb=3ead9c2be44a4f5bb6d32a776188931f7995048e;hp=7b5307daf9f632522414b5a1867fca3cf03af1de;hpb=634ad74db688a5305f001917453c5cd15305c539;p=lilypond.git diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc index 7b5307daf9..ccb91ab087 100644 --- a/lily/protected-scm.cc +++ b/lily/protected-scm.cc @@ -1,11 +1,10 @@ -/* +/* protected-scm.cc -- implement Protected_scm - + source file of the GNU LilyPond music typesetter - - (c) 1998--2005 Han-Wen Nienhuys - - */ + + (c) 1998--2007 Han-Wen Nienhuys +*/ #include "protected-scm.hh" @@ -16,7 +15,7 @@ Protected_scm::Protected_scm () Protected_scm::Protected_scm (SCM s) { - object_ = SCM_NIMP (s) ? scm_gc_protect_object (s): s; + object_ = SCM_NIMP (s) ? scm_gc_protect_object (s) : s; } Protected_scm::Protected_scm (Protected_scm const &s) @@ -31,12 +30,12 @@ Protected_scm::~Protected_scm () scm_gc_unprotect_object (object_); } -Protected_scm & +Protected_scm & Protected_scm::operator = (SCM s) { if (object_ == s) return *this; - + if (SCM_NIMP (object_)) scm_gc_unprotect_object (object_); @@ -44,7 +43,7 @@ Protected_scm::operator = (SCM s) return *this; } -Protected_scm& +Protected_scm & Protected_scm::operator = (Protected_scm const &s) { return operator = (s.object_); @@ -55,7 +54,7 @@ Protected_scm::operator SCM () const return object_; } -SCM +SCM Protected_scm::to_SCM () const { return object_;