Use GAP's gap_all.h

fingolfin · ChrisJefferson · commit 2c70004d650b · 2022-03-30T10:01:44.000+01:00
Note that it is C++ safe, so remove old workarounds
diff --git a/gap_cpp_headers/gap_cpp_mapping.hpp b/gap_cpp_headers/gap_cpp_mapping.hpp
@@ -8,9 +8,8 @@
 #include <deque>
 #include <list>
 
-// We have to include this to get around problems with the 'extern C' wrapping of compiled.h,
-// which includes gmp, which in C++ mode has some C++ templates.
-#include "include_gap_headers.hpp"
+#include "gap_all.h"
+
 #include "gap_exception.hpp"
 #include "gap_function.hpp"
 
diff --git a/gap_cpp_headers/gap_function.hpp b/gap_cpp_headers/gap_function.hpp
@@ -2,7 +2,7 @@
 #define GAP_FUNCTION_HPPQR
 
 #include <string>
-#include "include_gap_headers.hpp"
+#include "gap_all.h"
 
 class GAPFunction
 {
diff --git a/gap_cpp_headers/include_gap_headers.hpp b/gap_cpp_headers/include_gap_headers.hpp
diff --git a/src/ferret.cc b/src/ferret.cc
@@ -3,7 +3,7 @@
 ****************************************************************************/
 
 #include <stdio.h>
-#include "include_gap_headers.hpp"
+#include "gap_all.h"
 #include "c_to_cpp.h"
 #include "generated_headers/function_objs.h"
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#define GAP_FUNCTION_HPPQR`
`3`	`3`
`4`	`4`	`#include <string>`
`5`		`-#include "include_gap_headers.hpp"`
	`5`	`+#include "gap_all.h"`
`6`	`6`
`7`	`7`	`class GAPFunction`
`8`	`8`	`{`