12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

On MSVC, use aligned malloc and free

release/4.3a0
Frank Dellaert 2018-11-06 10:17:41 -05:00
parent 36f5dbf9d2
commit 4113d99e20
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/nonlinear/Expression-inl.h
View File

@ -200,7 +200,7 @@ T Expression<T>::valueAndJacobianMap(const Values& values,
// allocated on Visual Studio. For more information see the issue below // allocated on Visual Studio. For more information see the issue below
// https://bitbucket.org/gtborg/gtsam/issue/178/vlas-unsupported-in-visual-studio // https://bitbucket.org/gtborg/gtsam/issue/178/vlas-unsupported-in-visual-studio
#ifdef _MSC_VER #ifdef _MSC_VER
internal::ExecutionTraceStorage* traceStorage = new internal::ExecutionTraceStorage[size]; auto traceStorage = static_cast<internal::ExecutionTraceStorage*>(_aligned_malloc(size, internal::TraceAlignment));
#else #else
internal::ExecutionTraceStorage traceStorage[size]; internal::ExecutionTraceStorage traceStorage[size];
#endif #endif
@ -210,7 +210,7 @@ T Expression<T>::valueAndJacobianMap(const Values& values,
trace.startReverseAD1(jacobians); trace.startReverseAD1(jacobians);
#ifdef _MSC_VER #ifdef _MSC_VER
delete[] traceStorage; _aligned_free(traceStorage);
#endif #endif
return value; return value;