These should be the last VS (64 bit) warnings. Re #4473.

mantidproject · Mar 7, 2012 · 31fea1b · 31fea1b
1 parent 86e3100
commit 31fea1b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/src/SaveToSNSHistogramNexus.cpp b/Code/Mantid/Framework/DataHandling/src/SaveToSNSHistogramNexus.cpp
@@ -344,26 +344,25 @@ namespace DataHandling
         // Offset into array.
         size_t index = size_t(slabx)*size_t(dataDimensions[1])*size_t(dataDimensions[2]) + size_t(y)*size_t(dataDimensions[2]);
 
-        if (doBoth)
-        {
-          const MantidVec & Y = inputWorkspace->readY(wi);
-          const MantidVec & E = inputWorkspace->readE(wi);
-          std::copy(Y.begin(), Y.end(), data+index);
-          std::copy(E.begin(), E.end(), errors+index);
-        }
-        else
+        const MantidVec & Y = inputWorkspace->readY(wi);
+        const MantidVec & E = inputWorkspace->readE(wi);
+
+        for ( size_t i = 0; i < Y.size(); ++i )
         {
-          if (doErrors)
+          if ( doErrors )
           {
-            const MantidVec & E = inputWorkspace->readE(wi);
-            std::copy(E.begin(), E.end(), data+index);
+            data[i+index] = static_cast<float>(E[i]);
           }
           else
           {
-            const MantidVec & Y = inputWorkspace->readY(wi);
-            std::copy(Y.begin(), Y.end(), data+index);
+            data[i+index] = static_cast<float>(Y[i]);
+            if ( doBoth )
+            {
+              errors[i+index] = static_cast<float>(E[i]);
+            }
           }
         }
+
         PARALLEL_END_INTERUPT_REGION
       }
       PARALLEL_CHECK_INTERUPT_REGION

diff --git a/Code/Mantid/Framework/PythonInterface/CMakeLists.txt b/Code/Mantid/Framework/PythonInterface/CMakeLists.txt
@@ -62,6 +62,9 @@ set ( TEST_FILES
 
 if ( CXXTEST_FOUND )
   cxxtest_add_test ( PythonInterfaceTest ${TEST_FILES} )
+  if ( WIN32 )
+    set_target_properties( PythonInterfaceTest PROPERTIES COMPILE_FLAGS "/w44244" )
+  endif ()
   target_link_libraries( PythonInterfaceTest PythonKernelModule PythonAPIModule )
   add_dependencies ( FrameworkTests PythonInterfaceTest )
   # Add to the 'UnitTests' group in VS