Re: [Emc-developers] emc2 compiles but...

[Matt S. <ms...@er...>]

On Tuesday 27 January 2004 22:29, jmk...@at... wrote:
> but running "make indent" causes the following errors:
> > indent: rs274ngc_pre.cc:1101: Error:Unmatched 'else'
> > indent: rs274ngc_pre.cc:8744: Error:Unmatched 'else'

I'll look at this, wish me luck!

> It turns out that a half-dozen files had the same problem, a C++
> style ("//") comment that had lost it's trailing newline and ran into
> the next line.  Fixing those lines allowed make to run without errors.

Which files (other than emccanon.cc)?

> So Paul or Matt - tell me if it is safe to commit the indented
> code.  (We should always try to run indent before commits to avoid
> just the mess that would happen if I committed right now!)

Did you update your working copy before you did all this? I ask because I=
=20
committed some stuff early this morning (about 2:30am on Mon the 27th). I=
f=20
you did update after 2:30am, and thus have my changes, then go ahead.

The C++ files I changed were emccanon.cc, nml.cc, and emctaskmain.cc. Sin=
ce=20
you had trouble with emccanon.cc, check lines 623-625. They should read:

// Since there's no default case here,
// we need to initialise vel to something safe!
vel =3D currentLinearFeedRate;

Currently, I'm working only in emc2/src/emc/motion.

Matt