Still got problems compiling....

[Ralf Habacker]

> 61:template <class T1, class T2>
> > 62:Q_INLINE_TEMPLATES bool operator==( const QPair<T1, T2>& x, const
> > QPair<T1, T2>& y )
> > 63: {
> > 64:    return x.first == y.first && x.second == y.second;
> > 65:}
>
> I'm really confused now. Q_INLINE_TEMPLATES is not defined in any file inside
> of cygwin/qt-3 repository. BUT  Q_INLINE_TEMPLATES is used in qpair.h.
>
> Looking on my linux box, in qt-3.0.4, the qpair.h file doesn't use
> Q_INLINE_TEMPLATES, it uses just inline:
>
> 61:template <class T1, class T2>
> 62:inline bool operator==( const QPair<T1, T2>& x, const QPair<T1, T2>& y )
> 63:{
> 64:    return x.first == y.first && x.second == y.second;
> 65:}
>
> There are significant differences between linux/qpair.h and
> cygwin/qpair.h for
> under qt-3.0.4.
>
> So, I downloaded qt-3.0.5 for linux, and sure enough, in qpair.h:61
> 61: template <class T1, class T2>
> 62: Q_INLINE_TEMPLATES bool operator==( const QPair<T1, T2>& x, const
> QPair<T1, T2>& y )
> 63: {
> 64:    return x.first == y.first && x.second == y.second;
> 65: }
>
> There are very few difference between linux/qt-3.0.5 and cgywin/qt-3 in the
> qpair.h file. Did the 3.0.5 qpair.h file sneak into qt-3, which I believe is
> 3.0.4 based?

Let me say something general to the cvs structure.

We are importing the original sources from qt into the 1.1.1 branch with lower
case tags

        qt_3_1_0_rc1: 1.1.1.2
        qt_3_0_4: 1.1.1.1
        qt_3_0_3: 1.1.1.1
        RALF: 1.1.1

The cygwin releases have an upper case tag with a cygwin prefix

	QT_CYGWIN_3_0_4_B1: 1.2

In the last day's I have imported the QT3_1_0_rc1 release and this
src/tools/qpair.h (1.1.1.2)
contains the Q_INLINE_TEMPLATES.
The release under qt_3_0_4 (and 1.1) does not contain this MACRO.

After importing the qt 3_1_0_rc1 I have tagged the recent source with
QT_3_0_4_CYGWIN, but to my surprise, in the mostly cases this produeces the
expected behavior, but in single cases this tagging fails for example with
qpair.h.
Perhaps this causes your problems ?

At least this tag must be in the main branch or 1.1.1.1 but never greater.

------------- okay ------------

RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qpluginmanager_p.h,v
Working file: src/tools/qpluginmanager_p.h
head: 1.2
branch:
locks: strict
access list:
symbolic names:
	QT_3_0_4_CYGWIN: 1.2
	qt_3_1_0_rc1: 1.1.1.3
	qt_3_0_4: 1.1.1.2
	GNU_QT_WIN32_NATIVE: 1.2.0.2
	qt_3_0_3: 1.1.1.1
	RALF: 1.1.1
keyword substitution: kv
total revisions: 6
=============================================================================

-------- fails ------------

RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qpair.h,v
Working file: src/tools/qpair.h
head: 1.1
branch: 1.1.1
locks: strict
access list:
symbolic names:
	QT_3_0_4_CYGWIN: 1.1.1.2
	qt_3_1_0_rc1: 1.1.1.2
	qt_3_0_4: 1.1.1.1
	GNU_QT_WIN32_NATIVE: 1.1.1.1.0.4
	qt_3_0_3: 1.1.1.1
	RALF: 1.1.1
keyword substitution: kv
total revisions: 3
=============================================================================


$ cvs log src/tools/qpair.h
<snip>
symbolic names:
        QT_3_0_4_CYGWIN: 1.1.1.2
        qt_3_1_0_rc1: 1.1.1.2
        qt_3_0_4: 1.1.1.1
        GNU_QT_WIN32_NATIVE: 1.1.1.1.0.4
        qt_3_0_3: 1.1.1.1
        RALF: 1.1.1
keyword substitution: kv
total revisions: 3;     selected revisions: 3
description:
----------------------------
revision 1.1
date: 2002/04/18 19:45:53;  author: habacker;  state: Exp;
branches:  1.1.1;
Initial revision
----------------------------
revision 1.1.1.2
date: 2002/11/13 14:53:11;  author: habacker;  state: Exp;  lines: +23 -7
Qt 3.1 rc1
----------------------------
revision 1.1.1.1
date: 2002/04/18 19:45:53;  author: habacker;  state: Exp;  lines: +0 -0
QT3.0.3 Release
=============================================================================

May this be a cygwin cvs client issue ?  I will try with a unix os (the
sourceforge cvs)

Ralf