Refs #6315. More Intel warnings.

mantidproject · May 1, 2013 · 5b69d80 · 5b69d80
1 parent 54f4947
commit 5b69d80
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 21 deletions.
diff --git a/...ParaviewPlugins/ParaViewWidgets/RebinningCutterObjectPanel/RebinningCutterObjectPanel.cxx b/...ParaviewPlugins/ParaViewWidgets/RebinningCutterObjectPanel/RebinningCutterObjectPanel.cxx
@@ -1,18 +1,31 @@
 #include "RebinningCutterObjectPanel.h"
-#include "pqObjectPanelInterface.h"
-#include "pqPropertyManager.h"
-#include "pqNamedWidgets.h"
-#include "vtkSMStringVectorProperty.h"
-#include "vtkSMDoubleVectorProperty.h"
-#include <QLayout>
-#include <QMessageBox>
-#include <QCheckBox>
-#include <QGridLayout>
+
 #include "GeometryWidget.h"
 #include "ThresholdRangeWidget.h"
 #include "MantidGeometry/MDGeometry/MDGeometryXMLParser.h"
 #include "MantidVatesAPI/SynchronisingGeometryPresenter.h"
-#include "vtkSMProxyProperty.h"
+
+// Have to deal with ParaView warnings and Intel compiler the hard way.
+#if defined(__INTEL_COMPILER)
+  #pragma warning disable 1170
+#endif
+
+#include <pqObjectPanelInterface.h>
+#include <pqPropertyManager.h>
+#include <pqNamedWidgets.h>
+#include <vtkSMStringVectorProperty.h>
+#include <vtkSMDoubleVectorProperty.h>
+#include <vtkSMProxyProperty.h>
+
+#if defined(__INTEL_COMPILER)
+  #pragma warning enable 1170
+#endif
+
+#include <QLayout>
+#include <QMessageBox>
+#include <QCheckBox>
+#include <QGridLayout>
+
 using namespace Mantid::VATES;
 using namespace Mantid::Geometry;
 
@@ -175,4 +188,4 @@ void RebinningCutterObjectPanel::onGeometryChanged()
   {
     m_geomBinDisplayMode = m_geometryWidget->getBinDisplayMode();
   }
-}
+}
diff --git a/...ewPlugins/ParaViewWidgets/RebinningTransformObjectPanel/RebinningTransformObjectPanel.cxx b/...ewPlugins/ParaViewWidgets/RebinningTransformObjectPanel/RebinningTransformObjectPanel.cxx
@@ -1,18 +1,31 @@
 #include "RebinningTransformObjectPanel.h"
-#include "pqObjectPanelInterface.h"
-#include "pqPropertyManager.h"
-#include "pqNamedWidgets.h"
-#include "vtkSMStringVectorProperty.h"
-#include "vtkSMDoubleVectorProperty.h"
-#include <QLayout>
-#include <QMessageBox>
-#include <QCheckBox>
-#include <QGridLayout>
+
 #include "GeometryWidget.h"
 #include "ThresholdRangeWidget.h"
 #include "MantidGeometry/MDGeometry/MDGeometryXMLParser.h"
 #include "MantidVatesAPI/SynchronisingGeometryPresenter.h"
-#include "vtkSMProxyProperty.h"
+
+// Have to deal with ParaView warnings and Intel compiler the hard way.
+#if defined(__INTEL_COMPILER)
+  #pragma warning disable 1170
+#endif
+
+#include <pqObjectPanelInterface.h>
+#include <pqPropertyManager.h>
+#include <pqNamedWidgets.h>
+#include <vtkSMStringVectorProperty.h>
+#include <vtkSMDoubleVectorProperty.h>
+#include <vtkSMProxyProperty.h>
+
+#if defined(__INTEL_COMPILER)
+  #pragma warning enable 1170
+#endif
+
+#include <QLayout>
+#include <QMessageBox>
+#include <QCheckBox>
+#include <QGridLayout>
+
 using namespace Mantid::VATES;
 using namespace Mantid::Geometry;