From 556cef15585f5b61b44c50923231567e709b6b0d Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 19 Mar 2004 23:05:04 +0000 Subject: [PATCH] *** empty log message *** --- VERSION | 4 ++-- flower/include/virtual-methods.hh | 2 -- input/test/header-ifelse.ly | 5 +++-- lily/include/lily-guile.hh | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index b5127802c3..819f53c153 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=1 -PATCH_LEVEL=31 -MY_PATCH_LEVEL=hwn1 +PATCH_LEVEL=32 +MY_PATCH_LEVEL= diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh index 44cf1fcaab..d466eee89f 100644 --- a/flower/include/virtual-methods.hh +++ b/flower/include/virtual-methods.hh @@ -25,8 +25,6 @@ demangle_classname (std::type_info const &); VIRTUAL_COPY_CONSTRUCTOR (Baseclass, Foo); }; */ -Base *clone () const { return new Name (*this); } - #define VIRTUAL_COPY_CONSTRUCTOR(base, name) \ /* Hack to fix constness: gcc >= 2.95 is correct in defining \ typeof (*this) in a const member function to be const. */ \ diff --git a/input/test/header-ifelse.ly b/input/test/header-ifelse.ly index 52bb9884fb..bab5d1e22a 100644 --- a/input/test/header-ifelse.ly +++ b/input/test/header-ifelse.ly @@ -5,8 +5,9 @@ (define pieceTagLine (string-append "Jeremie " (lilypond-version) " was here"))) \header{ -tagline = \pieceTagLine -texidoc = " + + tagline = \pieceTagLine + texidoc = " High level functionality (eg. conditional defines), can be accomplished with GUILE. diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index aa549f9590..d9aad2c9de 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -270,7 +270,7 @@ typedef SCM (*Scheme_function_3) (...); /* Adds the NAME as a Scheme function, and a variable to store the SCM - version of the function. + version of the function in the static variable NAME_proc */ #define DECLARE_SCHEME_CALLBACK(NAME,ARGS) \ static SCM NAME ARGS; \ -- 2.39.5