From 4acaf938e3e0da6864c17c0026092ae01d205ef8 Mon Sep 17 00:00:00 2001 From: Tony Paulussen Date: Tue, 20 Aug 2024 15:14:58 +0200 Subject: [PATCH] fix: resolve MSVC build errors and warnings --- behaviortree_ros2/src/tree_execution_server.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/behaviortree_ros2/src/tree_execution_server.cpp b/behaviortree_ros2/src/tree_execution_server.cpp index c7dd46b..f712a52 100644 --- a/behaviortree_ros2/src/tree_execution_server.cpp +++ b/behaviortree_ros2/src/tree_execution_server.cpp @@ -11,7 +11,14 @@ // COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable : 4244) #include +#pragma warning(pop) +#else +#include +#endif #include "behaviortree_ros2/tree_execution_server.hpp" #include "behaviortree_ros2/bt_utils.hpp" @@ -235,7 +242,8 @@ void TreeExecutionServer::execute( const auto now = std::chrono::steady_clock::now(); if(now < loop_deadline) { - p_->tree.sleep(loop_deadline - now); + p_->tree.sleep(std::chrono::duration_cast( + loop_deadline - now)); } loop_deadline += period; }