Merge remote-tracking branch 'origin/bugfix/9048_smallWinBugs'

mantidproject · Feb 28, 2014 · c2fff94 · c2fff94
2 parents fddd47e + 53baf57
commit c2fff94
Show file tree

Hide file tree

Showing 26 changed files with 507 additions and 416 deletions.
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/BoxController.h b/Code/Mantid/Framework/API/inc/MantidAPI/BoxController.h
@@ -9,7 +9,6 @@
 #include "MantidAPI/IBoxControllerIO.h"
 #include <nexus/NeXusFile.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/interprocess/smart_ptr/unique_ptr.hpp>
 #include <vector>
 
 

diff --git a/Code/Mantid/Framework/API/src/IMDEventWorkspace.cpp b/Code/Mantid/Framework/API/src/IMDEventWorkspace.cpp
@@ -22,7 +22,8 @@ namespace API
   /** Copy constructor */
   IMDEventWorkspace::IMDEventWorkspace(const IMDEventWorkspace & other)
   : IMDWorkspace(other),
-    MultipleExperimentInfos(other)
+    MultipleExperimentInfos(other),
+    m_fileNeedsUpdating(other.m_fileNeedsUpdating)
   {
   }
 

diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/Divide.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/Divide.h
@@ -48,7 +48,7 @@ namespace Mantid
     {
     public:
       /// Default constructor
-      Divide() : BinaryOperation() {};
+      Divide() : BinaryOperation(),m_warnOnZeroDivide(true){};
       /// Destructor
       virtual ~Divide() {};
       /// Algorithm's name for identification overriding a virtual method
@@ -81,7 +81,7 @@ namespace Mantid
       void checkRequirements();
 
       std::string checkSizeCompatibility(const API::MatrixWorkspace_const_sptr lhs,const API::MatrixWorkspace_const_sptr rhs) const;
-
+      // usually you want to warn user if division by 0 occurs. set it to false to generate these warnings on debug level only
       bool m_warnOnZeroDivide;
 
     };

diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/CalculateGammaBackground.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/CalculateGammaBackground.h
@@ -118,6 +118,8 @@ namespace Mantid
 
       /// Pointer to progress reporting
       API::Progress *m_progress;
+      // internal method called within the loop to avoid true-catch operations which broke Microsoft compiler compiling in parallel
+      bool calculateBackground(size_t inputIndex, size_t ouptutIndex);
     };
 
 

diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/ConvertToYSpace.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/ConvertToYSpace.h
@@ -71,7 +71,7 @@ namespace CurveFitting
     void exec();
 
     /// Perform the conversion to Y-space
-    void convert(const size_t i);
+    bool convert(const size_t i);
     /// Check and store appropriate input data
     void retrieveInputs();
     /// Create the output workspace

diff --git a/Code/Mantid/Framework/CurveFitting/src/CalculateGammaBackground.cpp b/Code/Mantid/Framework/CurveFitting/src/CalculateGammaBackground.cpp