From a4f002a0525b1798ed44a6f06c57b4c68e8e6bac Mon Sep 17 00:00:00 2001 From: Mark Moll <mmoll@rice.edu> Date: Tue, 15 Jan 2013 13:28:04 -0600 Subject: [PATCH] Fix for boost version < 1.47 --- src/articulated_model/model_config.cpp | 5 +++++ src/ccd/interpolation/interpolation_factory.cpp | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/articulated_model/model_config.cpp b/src/articulated_model/model_config.cpp index 43d62de6..dcd15195 100644 --- a/src/articulated_model/model_config.cpp +++ b/src/articulated_model/model_config.cpp @@ -38,6 +38,11 @@ #include "fcl/articulated_model/joint.h" #include <algorithm> +// Define for boost version < 1.47 +#ifndef BOOST_ASSERT_MSG +#define BOOST_ASSERT_MSG(expr, msg) ((void)0) +#endif + namespace fcl { diff --git a/src/ccd/interpolation/interpolation_factory.cpp b/src/ccd/interpolation/interpolation_factory.cpp index c9f81ee2..5a7ed8df 100644 --- a/src/ccd/interpolation/interpolation_factory.cpp +++ b/src/ccd/interpolation/interpolation_factory.cpp @@ -39,6 +39,11 @@ #include <boost/assert.hpp> +// Define for boost version < 1.47 +#ifndef BOOST_ASSERT_MSG +#define BOOST_ASSERT_MSG(expr, msg) ((void)0) +#endif + namespace fcl { -- GitLab