From 5dcd61ba90a28a334cfe83b22e53f06f0ec3a6f4 Mon Sep 17 00:00:00 2001 From: JOSE LUIS BLANCO CLARACO Date: Sun, 25 Nov 2018 23:51:34 +0000 Subject: [PATCH 1/2] Fix PCH in MSVC --- gtsam/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtsam/CMakeLists.txt b/gtsam/CMakeLists.txt index 4d1007d19..8900ea86b 100644 --- a/gtsam/CMakeLists.txt +++ b/gtsam/CMakeLists.txt @@ -75,7 +75,7 @@ list(APPEND gtsam_srcs ${gtsam_core_headers}) IF(MSVC) # Add precompiled header to sources 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") ENDIF(MSVC) From b15f50fb8ff5d6c613723380f24ca123ef71db4f Mon Sep 17 00:00:00 2001 From: Jose Luis Blanco-Claraco Date: Mon, 26 Nov 2018 10:43:53 +0100 Subject: [PATCH 2/2] fix ambiguous function call (MSVC2017) --- gtsam/base/Vector.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtsam/base/Vector.cpp b/gtsam/base/Vector.cpp index 6dc9800ca..7caf490ef 100644 --- a/gtsam/base/Vector.cpp +++ b/gtsam/base/Vector.cpp @@ -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) { if (equal_with_abs_tol(expected,actual,tol)) return true; cout << "not equal:" << endl; - print(expected, "expected"); - print(actual, "actual"); + print(static_cast(expected), "expected"); + print(static_cast(actual), "actual"); return false; }