Re: small fixes for cmake merge

2007-05-28 Thread Andre Poenitz
On Sat, May 26, 2007 at 01:52:44AM +0200, Peter Kümmel wrote: > > | > | #include not there. > > | > > > | > In C++ iso646.h is not needed to get or/and etc. > > | > > | when you use gcc > > > > When you use a compiler that follows the C++ standard. > > > > Yes I know, GCC will save the world.

Re: small fixes for cmake merge

2007-05-25 Thread Peter Kümmel
Lars Gullik Bjønnes wrote: > Peter Kümmel <[EMAIL PROTECTED]> writes: > > | Lars Gullik Bjønnes wrote: > | > Peter Kümmel <[EMAIL PROTECTED]> writes: > | > > | > | Lars Gullik Bjønnes wrote: > | > | > Abdelrazak Younes <[EMAIL PROTECTED]> writes: > | > | > > | > | > | José Matos wrote: > | > |

Re: small fixes for cmake merge

2007-05-25 Thread Abdelrazak Younes
Andre Poenitz wrote: On Fri, May 25, 2007 at 08:59:25AM +0200, Abdelrazak Younes wrote: José Matos wrote: On Thursday 24 May 2007 19:24:28 Peter Kümmel wrote: { Types const t = type(params); - return (t == INPUT) or (t == INCLUDE); + return (t == INPUT) || (t == INCLUDE); }

Re: small fixes for cmake merge

2007-05-25 Thread Lars Gullik Bjønnes
Peter Kümmel <[EMAIL PROTECTED]> writes: | Lars Gullik Bjønnes wrote: | > Peter Kümmel <[EMAIL PROTECTED]> writes: | > | > | Lars Gullik Bjønnes wrote: | > | > Abdelrazak Younes <[EMAIL PROTECTED]> writes: | > | > | > | > | José Matos wrote: | > | > | > On Thursday 24 May 2007 19:24:28 Peter KÃ

Re: small fixes for cmake merge

2007-05-25 Thread Peter Kümmel
Lars Gullik Bjønnes wrote: > Peter Kümmel <[EMAIL PROTECTED]> writes: > > | Lars Gullik Bjønnes wrote: > | > Abdelrazak Younes <[EMAIL PROTECTED]> writes: > | > > | > | José Matos wrote: > | > | > On Thursday 24 May 2007 19:24:28 Peter Kümmel wrote: > | > | >> { > | > | >> Types const

Re: small fixes for cmake merge

2007-05-25 Thread Lars Gullik Bjønnes
José Matos <[EMAIL PROTECTED]> writes: | On Friday 25 May 2007 15:53:03 Peter Kümmel wrote: | > #include not there. | | In C++ it should be | | #include No. -- Lgb

Re: small fixes for cmake merge

2007-05-25 Thread Lars Gullik Bjønnes
Peter Kümmel <[EMAIL PROTECTED]> writes: | Lars Gullik Bjønnes wrote: | > Abdelrazak Younes <[EMAIL PROTECTED]> writes: | > | > | José Matos wrote: | > | > On Thursday 24 May 2007 19:24:28 Peter Kümmel wrote: | > | >> { | > | >> Types const t = type(params); | > | >> - return (t

Re: small fixes for cmake merge

2007-05-25 Thread Andre Poenitz
On Fri, May 25, 2007 at 08:59:25AM +0200, Abdelrazak Younes wrote: > José Matos wrote: > >On Thursday 24 May 2007 19:24:28 Peter Kümmel wrote: > >> { > >>Types const t = type(params); > >>- return (t == INPUT) or (t == INCLUDE); > >>+ return (t == INPUT) || (t == INCLUDE); > >>

Re: small fixes for cmake merge

2007-05-25 Thread Peter Kümmel
José Matos wrote: > On Thursday 24 May 2007 19:24:28 Peter Kümmel wrote: >> Index: src/frontends/qt4/QDocument.cpp >> === >> --- src/frontends/qt4/QDocument.cpp (revision 18495) >> +++ src/frontends/qt4/QDocument.cpp (working c

Re: small fixes for cmake merge

2007-05-25 Thread José Matos
On Friday 25 May 2007 15:53:03 Peter Kümmel wrote: > #include not there. In C++ it should be #include And this file has: /** @file ciso646 * This is a Standard C++ Library file. You should @c #include this file * in your programs, rather than any of the "*.h" implementation files. * *

Re: small fixes for cmake merge

2007-05-25 Thread Peter Kümmel
Lars Gullik Bjønnes wrote: > Abdelrazak Younes <[EMAIL PROTECTED]> writes: > > | José Matos wrote: > | > On Thursday 24 May 2007 19:24:28 Peter Kümmel wrote: > | >> { > | >> Types const t = type(params); > | >> - return (t == INPUT) or (t == INCLUDE); > | >> + return (t == I

Re: small fixes for cmake merge

2007-05-25 Thread Lars Gullik Bjønnes
Abdelrazak Younes <[EMAIL PROTECTED]> writes: | José Matos wrote: | > On Thursday 24 May 2007 19:24:28 Peter Kümmel wrote: | >> { | >> Types const t = type(params); | >> - return (t == INPUT) or (t == INCLUDE); | >> + return (t == INPUT) || (t == INCLUDE); | >> } | > Why is

Re: small fixes for cmake merge

2007-05-25 Thread Abdelrazak Younes
José Matos wrote: On Thursday 24 May 2007 19:24:28 Peter Kümmel wrote: { Types const t = type(params); - return (t == INPUT) or (t == INCLUDE); + return (t == INPUT) || (t == INCLUDE); } Why is this? You mean "_What_ is this?" It surely is not C++ at the first place :-)

Re: small fixes for cmake merge

2007-05-24 Thread Andre Poenitz
On Thu, May 24, 2007 at 07:32:15PM +0100, José Matos wrote: > On Thursday 24 May 2007 19:24:28 Peter Kümmel wrote: > >  { > > Types const t = type(params); > > -   return (t == INPUT) or (t == INCLUDE); > > +   return (t == INPUT) || (t == INCLUDE); +   return t == INPUT || t

Re: small fixes for cmake merge

2007-05-24 Thread José Matos
On Thursday 24 May 2007 19:24:28 Peter Kümmel wrote: > Index: src/frontends/qt4/QDocument.cpp > === > --- src/frontends/qt4/QDocument.cpp (revision 18495) > +++ src/frontends/qt4/QDocument.cpp (working copy) > @@ -891,7 +891,7

Re: small fixes for cmake merge

2007-05-24 Thread Richard Heck
José Matos wrote: > On Thursday 24 May 2007 19:24:28 Peter Kümmel wrote: > >> { >> Types const t = type(params); >> - return (t == INPUT) or (t == INCLUDE); >> + return (t == INPUT) || (t == INCLUDE); >> } >> > Why is this? And what does this has to do with merged file

Re: small fixes for cmake merge

2007-05-24 Thread Peter Kümmel
José Matos wrote: > On Thursday 24 May 2007 19:24:28 Peter Kümmel wrote: >> { >> Types const t = type(params); >> - return (t == INPUT) or (t == INCLUDE); >> + return (t == INPUT) || (t == INCLUDE); >> } > > Why is this? And what does this has to do with merged files? > It

Re: small fixes for cmake merge

2007-05-24 Thread José Matos
On Thursday 24 May 2007 19:24:28 Peter Kümmel wrote: >  { > Types const t = type(params); > -   return (t == INPUT) or (t == INCLUDE); > +   return (t == INPUT) || (t == INCLUDE); >  } Why is this? And what does this has to do with merged files? -- José Abílio

small fixes for cmake merge

2007-05-24 Thread Peter Kümmel
Here I need attached patch to compile cmake and merged files. Could it go in? Peter Index: src/insets/InsetInclude.cpp === --- src/insets/InsetInclude.cpp (revision 18495) +++ src/insets/InsetInclude.cpp (working copy) @@ -233,7 +233,