[mythtv] compilation problem on current SVN with DVB support

[Robin Gilks]

> Hi,
>
> I am getting the following compilation error:
>
> dvbchannel.cpp: In member function `bool DVBChannel::Tune(const
> DVBTuning&, bool, uint, bool)':
> dvbchannel.cpp:659: error: expected primary-expression before '<<' token
> dvbchannel.cpp:659: error: expected primary-expression before '<<' token
> dvbchannel.cpp:659: error: expected primary-expression before '<<' token
> dvbchannel.cpp:659: error: expected primary-expression before '<' token
> dvbchannel.cpp:659: error: expected primary-expression before '.' token
> dvbchannel.cpp:661: error: expected `;' before "if"
> dvbchannel.cpp:667: error: `freq_mult' was not declared in this scope
> dvbchannel.cpp:668: error: expected primary-expression before '>>' token
> dvbchannel.cpp:668: error: expected primary-expression before '>>' token
> dvbchannel.cpp:668: error: expected primary-expression before '>>' token
> dvbchannel.cpp:668: error: expected primary-expression before '>' token
> dvbchannel.cpp:668: error: expected primary-expression before '.' token
> dvbchannel.cpp:669: error: expected `;' before '{' token
> dvbchannel.cpp:667: warning: unused variable 'freq_mult'
> dvbchannel.cpp: At global scope:
> dvbchannel.cpp:825: warning: 'bool wait_for_backend(int, int)' defined
> but not used
> make[2]: *** [dvbchannel.o] Error 1
>
> As i am not a programmer, let alone cpp, does anyone have a suggestion?
>
> Cheers,
>
> Rudy

Did this happen just after an SVN update and the file had been modded by
hand (or a patch from a source other than SVN)? 'Cause it sure looks like
the diff markers used if there is a conflict in an svn update... Check the
source for lines containing
<<<<<<<
blah blah
>>>>>>>>
probably about line 659 since that is where the error is!


-- 
Robin Gilks