X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprotected-scm.cc;h=1bcc83fbc90ccd812d28aa6b7ba4c5a10c83c4b8;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=18f2205e566bca88b032b29be1cf7ee7c7af6150;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc index 18f2205e56..1bcc83fbc9 100644 --- a/lily/protected-scm.cc +++ b/lily/protected-scm.cc @@ -1,11 +1,10 @@ -/* - protected-scm.cc -- implement Protected_scm - +/* + protected-scm.cc -- implement Protected_scm + source file of the GNU LilyPond music typesetter - - (c) 1998--2004 Han-Wen Nienhuys - - */ + + (c) 1998--2008 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,10 +43,10 @@ Protected_scm::operator = (SCM s) return *this; } -Protected_scm& +Protected_scm & Protected_scm::operator = (Protected_scm const &s) { - return operator= (s.object_); + return operator = (s.object_); } Protected_scm::operator SCM () const @@ -55,7 +54,7 @@ Protected_scm::operator SCM () const return object_; } -SCM +SCM Protected_scm::to_SCM () const { return object_;