Re: Changes to stable-5-0 branch

[sfeam <sf...@us...>]

On Saturday, 13 February 2016 06:34:27 PM Bastian Märkisch wrote:
> Hi,
> 
> Today I checked in some changes to the stable-5-0 branch which make 
> gnuplot sources compatible with MSYS2/Mingw-w64 on Windows, as well as 
> they make wxWidgets 3.0 work.  These changes should in principle be 
> compatible with other platforms, but I could only check on CentOS5 & 6.
> Of course it still compiles cleanly using MSVC2012 or the old MSYS/MinGW 
> combination, too.

In general it is not good to make changes in the stable branch that have not
already been tested in the main branch (5.1).  Obviously there are exceptions
like fixing a bug that is only present in the stable branch.

In particular the change below is problematic because it was already tried in
the main branch and turned out to cause problems on some systems:

        * src/qtterminal/qt_term.h src/qtterminal/qt_conversion.cpp:  isnan()
        is in namespace std.

See 5.1 ChangeLog:

2015-12-10  Hans-Bernhard Broeker  <br...@ph...>

        * src/qtterminal/qt_conversion.cpp (qt_imageToQImage): Do not call
        C++ isnan() without a namespace specifier.

        EAM:  Reverting this change.  We may need a fix, but this isn't it.
        qtterminal/qt_conversion.cpp:
        In function 'QImage qt_imageToQImage(int, int, coordval*, t_imagecolor)':
        qtterminal/qt_conversion.cpp:129:14:
        error: expected unqualified-id before '(' token if (std::isnan(*image))

I don't know what the issue is here, but since adding the std:: qualifier
is known to break the build on some systems that were perfectly happy before
this, I think it is not suitable for the stable branch.   

> There's another patch I would like to include, which avoids warnings 
> about incompatible linkage of wxEvents on Windows.  It works on CentOS6, 
> too.  Could someone please verify it does not break e.g. the Mac build?

It works for me on linux (tested on 2 systems), but again I'd be happier if it went
into 5.1 before applying it to the stable branch.

	Ethan

>    Bastian