X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=3600d1dbfb1907e6c3e704aaf868481b7cd4c42c;hb=0adbc8b19405a3a383101abe7bc534e1e97ef441;hp=6dff3242439bcc0c16ea0d5eabbe2fc532570f46;hpb=99b6f3aa3558b01c9d4158b19a1f1794c534f89c;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 6dff324243..3600d1dbfb 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -38,7 +38,6 @@ using namespace std; #include "string-convert.hh" #include "warn.hh" -#include "ly-smobs.icc" Paper_outputter::Paper_outputter (SCM port, const string &format) { @@ -61,24 +60,12 @@ Paper_outputter::~Paper_outputter () { } -IMPLEMENT_SMOBS (Paper_outputter); -IMPLEMENT_DEFAULT_EQUAL_P (Paper_outputter); SCM -Paper_outputter::mark_smob (SCM x) +Paper_outputter::mark_smob () { - Paper_outputter *p = (Paper_outputter *) SCM_CELL_WORD_1 (x); - scm_gc_mark (p->output_module_); - return p->file_; -} - -int -Paper_outputter::print_smob (SCM /* x */, - SCM p, - scm_print_state *) -{ - scm_puts ("#", p); - return 1; + scm_gc_mark (output_module_); + return file_; } SCM