Clear most MSVC (64 bit build) warnings up to API. Re #4473.

mantidproject · Feb 13, 2012 · 39425f5 · 39425f5
1 parent 0e3b05f
commit 39425f5
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 10 deletions.
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmProperty.h b/Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmProperty.h
@@ -18,6 +18,13 @@ namespace Mantid
     //-------------------------------------------------------------------------
     class IAlgorithm;
 
+#ifdef _WIN32
+#pragma warning( push )
+// Disable 'multiple assignment operators specified' warning for this class
+//  - it's not an accident that we have more than one
+#pragma warning( disable: 4522 )
+#endif
+
     /**
     Define an algorithm property that can be used to supply an algorithm object 
     to a subsequent algorithm. It is a specialized version of PropertyWithValue
@@ -90,6 +97,11 @@ namespace Mantid
       /// The string used to create the underlying algorithm
       std::string m_algStr;
     };
+
+#ifdef _WIN32
+#pragma warning ( pop ) // Re-enable the warning about multiple assignment operators
+#endif
+
  } // namespace API
 } // namespace Mantid
 

diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/FileProperty.h b/Code/Mantid/Framework/API/inc/MantidAPI/FileProperty.h
@@ -11,6 +11,14 @@ namespace Mantid
 {
 namespace API
 {
+
+#ifdef _WIN32
+#pragma warning( push )
+// Disable 'multiple assignment operators specified' warning for this class
+//  - it's not an accident that we have more than one
+#pragma warning( disable: 4522 )
+#endif
+
   /**
      A specialized class for dealing with file properties. Mantid allows multiple
      search paths to be defined so that each of these is used when attempting to
@@ -90,6 +98,10 @@ class DLLExport FileProperty : public Kernel::PropertyWithValue<std::string>
   FileProperty& operator=( const FileProperty& right );
 };
 
+#ifdef _WIN32
+#pragma warning ( pop ) // Re-enable the warning about multiple assignment operators
+#endif
+
 }
 }
 

diff --git a/Code/Mantid/Framework/API/test/AlgorithmHistoryTest.h b/Code/Mantid/Framework/API/test/AlgorithmHistoryTest.h
@@ -89,7 +89,7 @@ class AlgorithmHistoryTest : public CxxTest::TestSuite
     Algorithm *testInput = new testalg;
     testInput->initialize();
     testInput->setPropertyValue("arg2_param", "5");
-    AlgorithmHistory history(testInput, 10000.,1.5);
+    AlgorithmHistory history(testInput);
 
     IAlgorithm_sptr compareAlg = history.createAlgorithm();
     TS_ASSERT_EQUALS(compareAlg->name(), testInput->name());

diff --git a/Code/Mantid/Framework/API/test/WorkspaceHistoryTest.h b/Code/Mantid/Framework/API/test/WorkspaceHistoryTest.h
@@ -98,8 +98,8 @@ class WorkspaceHistoryTest : public CxxTest::TestSuite
     simplesum2.execute();
 
     WorkspaceHistory history;
-    AlgorithmHistory alg1(&simplesum, 1000.0,1.0);
-    AlgorithmHistory alg2(&simplesum2, 1000.0,1.0);
+    AlgorithmHistory alg1(&simplesum);
+    AlgorithmHistory alg2(&simplesum2);
     history.addHistory(alg1);
     history.addHistory(alg2);
 

diff --git a/Code/Mantid/Framework/Geometry/test/NearestNeighboursTest.h b/Code/Mantid/Framework/Geometry/test/NearestNeighboursTest.h
@@ -257,7 +257,7 @@ class NearestNeighboursTestPerformance : public CxxTest::TestSuite
     NearestNeighbours nn(m_instrument, *spectramap);
     for(size_t i = 0; i < 2000; i++)
     {
-      nn.neighbours(1, true, 8.0);
+      nn.neighbours(1, true, 8);
     }
   }
 };

diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/PhysicalConstants.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/PhysicalConstants.h
@@ -1,15 +1,14 @@
 #ifndef MANTID_PHYSICALCONSTANTS_H_
 #define MANTID_PHYSICALCONSTANTS_H_
-#include <cfloat>
 
-#ifndef M_PI 
-#define M_PI 3.1415926535897932384626433832795 
-#endif
+#include <cmath>
+
 //NAN is not defined in visual c++
 #ifdef _MSC_VER
 #define INFINITY (DBL_MAX+DBL_MAX)
 #define NAN (INFINITY-INFINITY)
 #endif
+
 namespace Mantid
 {
 

diff --git a/Code/Mantid/Framework/NexusCPP/src/NeXusFile.cpp b/Code/Mantid/Framework/NexusCPP/src/NeXusFile.cpp
@@ -910,7 +910,7 @@ string File::getStrData() {
   {
     this->getData(value);
   }
-  catch (Exception& e)
+  catch (Exception&)
   {
     delete[] value;
     throw;
@@ -1176,7 +1176,7 @@ string File::getStrAttr(const AttrInfo & info) {
   {
     this->getAttr(info, value, info.length+1);
   }
-  catch (Exception& e)
+  catch (Exception&)
   {
     //Avoid memory leak
     delete [] value;