channellist.cpp defekt

[PT-1]

Code: Alles auswählen

channellist.cpp: In member function `void CChannelList::virtual_zap_mode(bool)':
channellist.cpp:808: error: expected primary-expression before '<<' token
channellist.cpp:808: error: expected primary-expression before '<<' token
channellist.cpp:808: error: expected primary-expression before '<<' token
channellist.cpp:808: error: expected primary-expression before '<' token
channellist.cpp:808: error: `channellist' undeclared (first use this function)
channellist.cpp:808: error: (Each undeclared identifier is reported only once fo r each function it appears in.)
channellist.cpp:809: error: expected `;' before "else"
channellist.cpp:814: error: expected primary-expression before "else"
channellist.cpp:814: error: expected `;' before "else"
channellist.cpp:819: error: expected primary-expression before '==' token
channellist.cpp:819: error: expected primary-expression before '==' token
channellist.cpp:819: error: expected primary-expression before '==' token
channellist.cpp:819: error: expected primary-expression before '=' token
channellist.cpp:820: error: expected primary-expression before "else"
channellist.cpp:820: error: expected `;' before "else"
channellist.cpp:824: error: expected primary-expression before "else"
channellist.cpp:824: error: expected `;' before "else"
channellist.cpp:828: error: expected primary-expression before '>>' token
channellist.cpp:828: error: expected primary-expression before '>>' token
channellist.cpp:828: error: expected primary-expression before '>>' token
channellist.cpp:828: error: expected primary-expression before '>' token
channellist.cpp:829: error: expected `;' before "else"
channellist.cpp:835: error: expected primary-expression before "else"
channellist.cpp:835: error: expected `;' before "else"
channellist.cpp:845: error: expected primary-expression before "else"
channellist.cpp:845: error: expected `;' before "else"
make[5]: *** [channellist.o] Error 1
make[5]: Leaving directory `/home/ubuntu/210806/apps/tuxbox/neutrino/src/gui'
make[4]: *** [all-recursive] Error 1
make[4]: Leaving directory `/home/ubuntu/210806/apps/tuxbox/neutrino/src/gui'
make[3]: *** [all-recursive] Error 1
make[3]: Leaving directory `/home/ubuntu/210806/apps/tuxbox/neutrino/src'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/home/ubuntu/210806/apps/tuxbox/neutrino'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/home/ubuntu/210806/apps/tuxbox/neutrino'
make: *** [/home/ubuntu/210806/tuxbox/cdkflash/root-neutrino] Error 2

[mws]

nope
there has a merge happened between 2 different versions.

solutions
1 - delete file - cvs update afterwards - result everything fine
2 - edit file and cleanup the merge by hand - result everything fine

best regards
mws

[Barf]

Die Datei kompiliert. Du hast beim patch/update-Zyklus es geschafft, CVS zu verwirren, so dass CVS beim update die Datei mit "Conflicts" bezeichnet hat. Lese die Datei mit einem Editor, so siehst du was ich meine (Zeile 808 etc). Fix:

rm .../channellist.cpp
cvs -z3 up

so bekommst du eine neue.

Zwei Ratschläge habe ich für dich:

1. Bei jedem cvs update, kontrollere für "conflicts"
2. Bei Verdacht dass CVS sich in einem unkompilierbaren Zustand sich befindet, schaue nach bei dietmarw, http://dietmarw2.trale.de/ falls sein nächtlichen Build geklappt hat.