[paraview] Another crack at fixing gcc 4.7 compile error

Orion Poplawski orion at fedoraproject.org
Mon Jan 30 22:27:32 UTC 2012


commit 717ed87dede76eae5d28f57185925c3f0b9cbc1d
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Jan 30 15:27:28 2012 -0700

    Another crack at fixing gcc 4.7 compile error

 paraview-gcc47.patch |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/paraview-gcc47.patch b/paraview-gcc47.patch
index 36f7756..c34e901 100644
--- a/paraview-gcc47.patch
+++ b/paraview-gcc47.patch
@@ -1,3 +1,15 @@
+diff -up ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h.gcc47 ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h
+--- ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h.gcc47	2012-01-27 12:12:55.623530977 -0700
++++ ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h	2012-01-30 15:26:33.107335300 -0700
+@@ -72,7 +72,7 @@ public:
+     Clear          = QItemSelectionModel::Clear,
+     Select         = QItemSelectionModel::Select,
+     Deselect       = QItemSelectionModel::Deselect, 
+-    ClearAndSelect = Clear | Select
++    ClearAndSelect = static_cast<int>(Clear) | static_cast<int>(Select)
+   };
+   Q_DECLARE_FLAGS(SelectionFlags, SelectionFlag)
+ 
 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
 --- ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx.gcc47	2011-11-08 13:56:29.000000000 -0700
 +++ ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx	2012-01-27 09:30:00.088542888 -0700


More information about the scm-commits mailing list