Skip to content
Snippets Groups Projects
Commit 31fea1bd authored by Russell Taylor's avatar Russell Taylor
Browse files

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

parent 86e3100b
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment