X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprotected-scm.cc;h=4447371a8318336d909cb4e10cc59e518423cf5a;hb=0e48c075bce7d60693c5324dab175a650d477f0a;hp=7b5307daf9f632522414b5a1867fca3cf03af1de;hpb=634ad74db688a5305f001917453c5cd15305c539;p=lilypond.git diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc index 7b5307daf9..4447371a83 100644 --- a/lily/protected-scm.cc +++ b/lily/protected-scm.cc @@ -1,11 +1,21 @@ -/* - protected-scm.cc -- implement Protected_scm - - source file of the GNU LilyPond music typesetter - - (c) 1998--2005 Han-Wen Nienhuys - - */ +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 1998--2011 Han-Wen Nienhuys + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ #include "protected-scm.hh" @@ -16,7 +26,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 +41,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 +54,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 +65,7 @@ Protected_scm::operator SCM () const return object_; } -SCM +SCM Protected_scm::to_SCM () const { return object_;