Refs #9247. Making RHEL6 happy.

Having to lobotomize C++11 code since RHEL6 can't cope. I hate RHEL6.
mantidproject · Apr 1, 2014 · 5663c9d · 5663c9d
1 parent 5ffad5c
commit 5663c9d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkMDHexFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkMDHexFactory.cpp
@@ -28,7 +28,7 @@ namespace Mantid
     */
   vtkMDHexFactory::vtkMDHexFactory(ThresholdRange_scptr thresholdRange, const std::string& scalarName, const size_t maxDepth) :
     m_thresholdRange(thresholdRange), m_scalarName(scalarName), m_maxDepth(maxDepth),
-    dataSet(nullptr), slice(false), sliceMask(nullptr), sliceImplicitFunction(nullptr), m_time(0)
+    dataSet(NULL), slice(false), sliceMask(NULL), sliceImplicitFunction(NULL), m_time(0)
   {
   }
 

diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkSplatterPlotFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkSplatterPlotFactory.cpp
@@ -49,8 +49,8 @@ namespace VATES
   vtkSplatterPlotFactory::vtkSplatterPlotFactory(ThresholdRange_scptr thresholdRange, const std::string& scalarName, const size_t numPoints, const double percentToUse ) :
   m_thresholdRange(thresholdRange), m_scalarName(scalarName), 
   m_numPoints(numPoints), m_percentToUse(percentToUse),
-  m_buildSortedList(true), m_wsName(""), dataSet(nullptr),
-  slice(false), sliceMask(nullptr), sliceImplicitFunction(nullptr),
+  m_buildSortedList(true), m_wsName(""), dataSet(NULL),
+  slice(false), sliceMask(NULL), sliceImplicitFunction(NULL),
   m_time(0.0)
   {
   }
@@ -211,7 +211,7 @@ namespace VATES
     {
       MDBox<MDE,nd> *box = dynamic_cast<MDBox<MDE,nd> *>(m_sortedBoxes[box_index]);
       box_index++;
-      if (box == nullptr)
+      if (NULL == box)
       {
         continue;
       }