Merge remote-tracking branch 'origin/devel' into HEAD

.travis.yml

@@ -6,11 +6,12 @@ env:
     - CTEST_OUTPUT_ON_FAILURE=1
     - CXX_FLAGS_DEBUG="-O1"
     - BUILD_PYTHON_INTERFACE=ON
+    - MAKEFLAGS="-j2"
 
 matrix:
   include:
-    - name: "Trusty - Debug - g++"
-      env: BUILD_TYPE=Debug
+    - name: "Trusty - Release - g++"
+      env: BUILD_TYPE=Release
       dist: trusty
       compiler: g++
       addons:
@@ -21,18 +22,6 @@ matrix:
             - libassimp-dev
             - libeigen3-dev
 
-    - name: "Xenial - Debug - g++"
-      env: BUILD_TYPE=Debug
-      dist: xenial
-      compiler: g++
-      addons:
-        apt:
-          packages:
-            - cmake
-            - libboost-all-dev
-            - libassimp-dev
-            - libeigen3-dev
-            - liboctomap-dev
     - name: "Xenial - Release - g++"
       env: BUILD_TYPE=Release
       dist: xenial
@@ -45,10 +34,11 @@ matrix:
             - libassimp-dev
             - libeigen3-dev
             - liboctomap-dev
-    - name: "Xenial - Debug - clang"
-      env: BUILD_TYPE=Debug
-      dist: xenial
-      compiler: clang
+
+    - name: "Bionic - Release - g++"
+      env: BUILD_TYPE=Release
+      dist: bionic
+      compiler: g++
       addons:
         apt:
           packages:
@@ -60,7 +50,7 @@ matrix:
 
     - name: "Bionic - Debug - g++"
       env: BUILD_TYPE=Debug
-      dist: xenial
+      dist: bionic
       compiler: g++
       addons:
         apt:
@@ -71,8 +61,8 @@ matrix:
             - libeigen3-dev
             - liboctomap-dev
 
-    - name: "OSX - Debug - clang"
-      env: BUILD_TYPE=Debug
+    - name: "OSX - Release - clang"
+      env: BUILD_TYPE=Release
       os: osx
       compiler: clang
       addons:
@@ -102,11 +92,11 @@ script:
   - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS=-w -DCMAKE_CXX_FLAGS_DEBUG=${CXX_FLAGS_DEBUG} -DBUILD_PYTHON_INTERFACE=${BUILD_PYTHON_INTERFACE} ..
 
   # Build
-  - make -j4
+  - make
 
   # Run unit tests
-  - travis_wait 30 ctest
+  - travis_wait 30 make test
 
   # Make sure we can install and uninstall with no issues
-  - sudo make -j4 install
-  - sudo make -j4 uninstall
+  - sudo make install
+  - sudo make uninstall

include/hpp/fcl/mesh_loader/assimp.h

@@ -3,7 +3,8 @@
  *
  *  Copyright (c) 2011-2014, Willow Garage, Inc.
  *  Copyright (c) 2014-2015, Open Source Robotics Foundation
- *  Copyright (c) 2016, CNRS - LAAS
+ *  Copyright (c) 2016-2019, CNRS - LAAS
+ *  Copyright (c) 2019, INRIA
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without

src/mesh_loader/assimp.cpp

@@ -34,6 +34,14 @@
 
 #include <hpp/fcl/mesh_loader/assimp.h>
 
+// Assimp >= 5.0 is forcing the use of C++11 keywords. A fix has been submitted https://github.com/assimp/assimp/pull/2758.
+// The next lines fixes the bug for current version of hpp-fcl.
+#include <assimp/defs.h>
+#if __cplusplus < 201103L && defined(AI_NO_EXCEPT)
+  #undef AI_NO_EXCEPT
+  #define AI_NO_EXCEPT
+#endif
+
 #ifdef HPP_FCL_USE_ASSIMP_UNIFIED_HEADER_NAMES
   #include <assimp/DefaultLogger.hpp>
   #include <assimp/IOStream.hpp>