Merge branch 'master' of ssh://git.code.sf.net/p/foam-extend/foam-extend-3.2
[foam-extend-3.2.git] / ThirdParty / rpmBuild / SOURCES / paraview-gcc47.patch
blobc34e901264ecbad3ab4bba4ed5bf031f3d4e21fa
1 diff -up ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h.gcc47 ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h
2 --- ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h.gcc47 2012-01-27 12:12:55.623530977 -0700
3 +++ ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h 2012-01-30 15:26:33.107335300 -0700
4 @@ -72,7 +72,7 @@ public:
5 Clear = QItemSelectionModel::Clear,
6 Select = QItemSelectionModel::Select,
7 Deselect = QItemSelectionModel::Deselect,
8 - ClearAndSelect = Clear | Select
9 + ClearAndSelect = static_cast<int>(Clear) | static_cast<int>(Select)
11 Q_DECLARE_FLAGS(SelectionFlags, SelectionFlag)
13 diff -up ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx.gcc47 ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx
14 --- ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx.gcc47 2011-11-08 13:56:29.000000000 -0700
15 +++ ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx 2012-01-27 09:30:00.088542888 -0700
16 @@ -37,6 +37,8 @@
17 #include "vtkTimeSourceExample.h"
18 #include "vtkXdmfReader.h"
20 +#include <unistd.h>
22 #define NUMTESTS 20
24 const char testobject[NUMTESTS][40] = {