Remove non default ikfast solver and add build fixes

kbrameld · Jul 27, 2020 · cf4069d · cf4069d
1 parent b360595
commit cf4069d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/map_creator/include/map_creator/ikfast.h b/map_creator/include/map_creator/ikfast.h
@@ -35,6 +35,7 @@
 #include <vector>
 #include <list>
 #include <stdexcept>
+#include <cmath>
 
 #ifndef IKFAST_HEADER_COMMON
 #define IKFAST_HEADER_COMMON

diff --git a/map_creator/include/map_creator/kinematics.h b/map_creator/include/map_creator/kinematics.h
@@ -3,10 +3,9 @@
 #define IKFAST_NO_MAIN
 
 #define IK_VERSION 61
-//#include "mh5_ikfast.cpp"
+#include "mh5_ikfast.cpp"
 //#include "abb_irb2400_manipulator_ikfast_solver.cpp"
 //#include "ur5_ikfast.cpp"
-#include "evoid_manipulator_ikfast_solver.cpp"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/map_creator/include/map_creator/mh5_ikfast.cpp b/map_creator/include/map_creator/mh5_ikfast.cpp
@@ -20,6 +20,7 @@
 #define IKFAST_HAS_LIBRARY
 #include "ikfast.h"  // found inside share/openrave-X.Y/python/ikfast.h
 using namespace ikfast;
+using namespace std;
 
 // check if the included ikfast version matches what this file was compiled with
 #define IKFAST_COMPILE_ASSERT(x) extern int __dummy[(int)x]