From 73538b436f054113d2f813dec3ff3367c112f475 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Fri, 16 Aug 2019 17:52:46 -0700 Subject: [PATCH 1/3] Fix warnings from vs2019 Build log: https://dev.azure.com/dartsim/dart/_build/results?buildId=1587&view=logs&jobId=3bcc548c-0df3-5c60-b8ef-b9233b9b23f1&taskId=5d8baed6-9a20-5b12-6996-82143a809734&lineStart=268&lineEnd=269&colStart=1&colEnd=1 --- dart/utils/XmlHelpers.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dart/utils/XmlHelpers.cpp b/dart/utils/XmlHelpers.cpp index c444aef791a1a..f3c6c744e4ee1 100644 --- a/dart/utils/XmlHelpers.cpp +++ b/dart/utils/XmlHelpers.cpp @@ -192,7 +192,7 @@ Eigen::Vector2d toVector2d(const std::string& str) { std::cerr << "value [" << pieces[i] << "] is not a valid double for Eigen::Vector2d[" << i - << std::endl; + << "]: " << e.what() << std::endl; } } } @@ -222,8 +222,8 @@ Eigen::Vector3d toVector3d(const std::string& str) catch (boost::bad_lexical_cast& e) { std::cerr << "value [" << pieces[i] - << "] is not a valid double for Eigen::Vector3d[" << i << "]" - << std::endl; + << "] is not a valid double for Eigen::Vector3d[" << i + << "]: " << e.what() << std::endl; } } } @@ -253,8 +253,8 @@ Eigen::Vector3i toVector3i(const std::string& str) catch (boost::bad_lexical_cast& e) { std::cerr << "value [" << pieces[i] - << "] is not a valid int for Eigen::Vector3i[" << i << "]" - << std::endl; + << "] is not a valid int for Eigen::Vector3i[" << i << "]: " + << e.what() << std::endl; } } } @@ -284,8 +284,8 @@ Eigen::Vector6d toVector6d(const std::string& str) catch (boost::bad_lexical_cast& e) { std::cerr << "value [" << pieces[i] - << "] is not a valid double for Eigen::Vector6d[" << i << "]" - << std::endl; + << "] is not a valid double for Eigen::Vector6d[" << i + << "]: " << e.what() << std::endl; } } } @@ -315,8 +315,8 @@ Eigen::VectorXd toVectorXd(const std::string& str) catch (boost::bad_lexical_cast& e) { std::cerr << "value [" << pieces[i] - << "] is not a valid double for Eigen::VectorXd[" << i << "]" - << std::endl; + << "] is not a valid double for Eigen::VectorXd[" << i + << "]: " << e.what() << std::endl; } } } @@ -346,8 +346,8 @@ Eigen::Isometry3d toIsometry3d(const std::string& str) catch (boost::bad_lexical_cast& e) { std::cerr << "value [" << pieces[i] - << "] is not a valid double for SE3[" << i << "]" - << std::endl; + << "] is not a valid double for SE3[" << i << "]: " + << e.what() << std::endl; } } } @@ -379,8 +379,8 @@ Eigen::Isometry3d toIsometry3dWithExtrinsicRotation(const std::string& str) catch (boost::bad_lexical_cast& e) { std::cerr << "value [" << pieces[i] - << "] is not a valid double for SE3[" << i << "]" - << std::endl; + << "] is not a valid double for SE3[" << i << "]: " + << e.what() << std::endl; } } } From 5694d5ba407e2bc3453d395be443254c29d226ae Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Fri, 16 Aug 2019 17:54:24 -0700 Subject: [PATCH 2/3] Format code --- dart/dynamics/SharedLibraryIkFast.cpp | 4 ++-- dart/utils/XmlHelpers.cpp | 12 ++++++------ .../test_MultiObjectiveOptimization.cpp | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dart/dynamics/SharedLibraryIkFast.cpp b/dart/dynamics/SharedLibraryIkFast.cpp index 3b4d1b1310438..a11faee2233f2 100644 --- a/dart/dynamics/SharedLibraryIkFast.cpp +++ b/dart/dynamics/SharedLibraryIkFast.cpp @@ -56,8 +56,8 @@ bool loadFunction( if (!symbol) { - dterr << "Failed to load the symbol '" << symbolName - << "' from the file '" << fileName << "'.\n"; + dterr << "Failed to load the symbol '" << symbolName << "' from the file '" + << fileName << "'.\n"; return false; } diff --git a/dart/utils/XmlHelpers.cpp b/dart/utils/XmlHelpers.cpp index f3c6c744e4ee1..e3d4e46636f7b 100644 --- a/dart/utils/XmlHelpers.cpp +++ b/dart/utils/XmlHelpers.cpp @@ -253,8 +253,8 @@ Eigen::Vector3i toVector3i(const std::string& str) catch (boost::bad_lexical_cast& e) { std::cerr << "value [" << pieces[i] - << "] is not a valid int for Eigen::Vector3i[" << i << "]: " - << e.what() << std::endl; + << "] is not a valid int for Eigen::Vector3i[" << i + << "]: " << e.what() << std::endl; } } } @@ -346,8 +346,8 @@ Eigen::Isometry3d toIsometry3d(const std::string& str) catch (boost::bad_lexical_cast& e) { std::cerr << "value [" << pieces[i] - << "] is not a valid double for SE3[" << i << "]: " - << e.what() << std::endl; + << "] is not a valid double for SE3[" << i + << "]: " << e.what() << std::endl; } } } @@ -379,8 +379,8 @@ Eigen::Isometry3d toIsometry3dWithExtrinsicRotation(const std::string& str) catch (boost::bad_lexical_cast& e) { std::cerr << "value [" << pieces[i] - << "] is not a valid double for SE3[" << i << "]: " - << e.what() << std::endl; + << "] is not a valid double for SE3[" << i + << "]: " << e.what() << std::endl; } } } diff --git a/unittests/comprehensive/test_MultiObjectiveOptimization.cpp b/unittests/comprehensive/test_MultiObjectiveOptimization.cpp index 71f71514cc8ba..6d1c59c57723c 100644 --- a/unittests/comprehensive/test_MultiObjectiveOptimization.cpp +++ b/unittests/comprehensive/test_MultiObjectiveOptimization.cpp @@ -7,7 +7,7 @@ #include #include #if HAVE_PAGMO -#include +# include #endif using namespace dart; From 9ee2fa4653ac4419c9d457d6cabe4e5885beb43b Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Fri, 16 Aug 2019 20:08:42 -0700 Subject: [PATCH 3/3] Set DART_VERBOSE=On on Appveyor --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index d2f70f5a4b5d7..dd5a8fdaca4aa 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -76,7 +76,7 @@ build_script: # Windows 10 #------------------ - cmd: mkdir build && cd build - - cmd: cmake %CMAKE_GENERATOR% -DCMAKE_BUILD_TYPE=%configuration% -DDART_MSVC_DEFAULT_OPTIONS="%MSVC_DEFAULT_OPTIONS%" %CMAKE_TOOLCHAIN_FILE% %CMAKE_TOOLCHAIN% .. + - cmd: cmake %CMAKE_GENERATOR% -DCMAKE_BUILD_TYPE=%configuration% -DDART_VERBOSE=ON -DDART_MSVC_DEFAULT_OPTIONS="%MSVC_DEFAULT_OPTIONS%" %CMAKE_TOOLCHAIN_FILE% %CMAKE_TOOLCHAIN% .. # - cmd: cmake --build . --target ALL_BUILD --config %configuration% -- /maxcpucount:4 /verbosity:quiet #-------------------------------