Marc Hohl <m...@hohlart.de> writes: > Hi list, > > after a recent "git pull", the call "make -j3" fails with > > --- > > In file included from slur-engraver.cc:32:0: > slur-engraver.cc: In static member function 'static void > Slur_engraver::boot()': > ./include/translator.icc:115:40: error: > '&Slur_proto_engraver::listen_slur' is not a valid template argument > for type 'void (Slur_engraver::*)(Stream_event*)' because it is of > type 'void (Slur_proto_engraver::*)(Stream_event*)' > method_finder<&cl::listen_ ## m> (), \ > ^ > slur-engraver.cc:65:3: note: in expansion of macro 'ADD_LISTENER' > ADD_LISTENER (Slur_engraver, slur); > ^ > ./include/translator.icc:115:40: note: standard conversions are not > allowed in this context > method_finder<&cl::listen_ ## m> (), \ > ^ > slur-engraver.cc:65:3: note: in expansion of macro 'ADD_LISTENER' > ADD_LISTENER (Slur_engraver, slur); > ^ > make[1]: *** [out/slur-engraver.o] Error 1 > make[1]: *** Waiting for unfinished jobs.... > make[1]: Leaving directory `/home/marc/git/lilypond/lily' > make: *** [all] Fehler 2 > > --- > > The error is reproducable with a fresh git clone > > Any ideas?
Well, it got through patchy-staging. So obviously something is different with your setup, and you don't give any information about your setup. What does g++ --version say? You used git pull (rather than git pull -r). That causes a merge rather than a rebase. Recent changes in master happened to be reverts which did not apply cleanly but had to be significantly edited. Adding merge resolution on top might lead to problems. Can you try rebasing on master/origin and see whether that helps? -- David Kastrup _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
