From 5fa85553b6600a7b92e3954729eaf1778e1f7008 Mon Sep 17 00:00:00 2001 From: Justin Carpentier <justin.carpentier@inria.fr> Date: Sun, 8 Dec 2019 15:33:57 +0100 Subject: [PATCH] assimp: fix compatibility issue with C++11 --- src/mesh_loader/assimp.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mesh_loader/assimp.cpp b/src/mesh_loader/assimp.cpp index 2645a4be..a160555a 100644 --- a/src/mesh_loader/assimp.cpp +++ b/src/mesh_loader/assimp.cpp @@ -32,6 +32,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#if __cplusplus < 201103L + #define nullptr NULL +#endif #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. -- GitLab