Skip to content
Snippets Groups Projects
Commit a27f760f authored by Atkins, Charles Vernon's avatar Atkins, Charles Vernon
Browse files

Merge branch 'fix-vcs2017-build' into release

* fix-vcs2017-build:
  Silence MSVC TR1 noise
  Fix index OOB error
  Re-enable vs2017
parents c3936f7f 45bd23f6
No related branches found
No related tags found
No related merge requests found
......@@ -39,6 +39,19 @@ endif()
# Let windows builds auto-export dll symbols
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
#------------------------------------------------------------------------------#
# Silence MSVC warnings
#------------------------------------------------------------------------------#
if(MSVC)
add_definitions(
-D_CRT_SECURE_NO_DEPRECATE
-D_CRT_SECURE_NO_WARNINGS
-D_SCL_SECURE_NO_DEPRECATE
-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
)
endif()
#------------------------------------------------------------------------------#
# Top level options
#------------------------------------------------------------------------------#
......
......@@ -4,7 +4,7 @@ skip_branch_with_pr: true
os:
- Visual Studio 2015
# - Visual Studio 2017
- Visual Studio 2017
platform:
- x86
......
......@@ -369,9 +369,9 @@ void BP3Deserializer::ClipContiguousMemoryCommonRow(
char *rawVariableData = reinterpret_cast<char *>(variable.GetData());
std::copy(&contiguousMemory[contiguousStart],
&contiguousMemory[contiguousStart + stride],
&rawVariableData[variableStart]);
std::copy(contiguousMemory.begin() + contiguousStart,
contiguousMemory.begin() + contiguousStart + stride,
rawVariableData + variableStart);
// here update each index recursively, always starting from the 2nd
// fastest changing index, since fastest changing index is the
......
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