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

Merged in jlblancoc/gtsam/fix-msvc-pch (pull request #342) 

Fix MSVC PCH
release/4.3a0
JOSE LUIS BLANCO CLARACO 2018-11-26 19:01:17 +00:00 committed by Frank Dellaert
parent 84febaf679 b15f50fb8f
commit 0e679b8b97
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtsam/CMakeLists.txt
View File

@ -75,7 +75,7 @@ list(APPEND gtsam_srcs ${gtsam_core_headers})
IF(MSVC) IF(MSVC)
# Add precompiled header to sources # Add precompiled header to sources
include(gtsamAddPch) include(gtsamAddPch)
gtsamAddPch("precompiled_header.h" "precompiled_header.cpp" ${gtsam_srcs}) gtsamAddPch("precompiled_header.h" "precompiled_header.cpp" "${gtsam_srcs}")
list(INSERT gtsam_srcs 0 "precompiled_header.cpp") list(INSERT gtsam_srcs 0 "precompiled_header.cpp")
ENDIF(MSVC) ENDIF(MSVC)

4
gtsam/base/Vector.cpp
View File

@ -125,8 +125,8 @@ bool assert_inequal(const Vector& expected, const Vector& actual, double tol) {
bool assert_equal(const SubVector& expected, const SubVector& actual, double tol) { bool assert_equal(const SubVector& expected, const SubVector& actual, double tol) {
if (equal_with_abs_tol(expected,actual,tol)) return true; if (equal_with_abs_tol(expected,actual,tol)) return true;
cout << "not equal:" << endl; cout << "not equal:" << endl;
print(expected, "expected"); print(static_cast<Vector>(expected), "expected");
print(actual, "actual"); print(static_cast<Vector>(actual), "actual");
return false; return false;
} }