moved include <cmath> from my_global.h

MariaDB · May 26, 2018 · aeaac6c · aeaac6c
1 parent 8f888ab
commit aeaac6c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/include/my_global.h b/include/my_global.h
@@ -828,10 +828,6 @@ inline unsigned long long my_double2ulonglong(double d)
 #define SIZE_T_MAX      (~((size_t) 0))
 #endif
 
-#ifdef __cplusplus
-#include <cmath>
-#endif
-
 /* Define missing math constants. */
 #ifndef M_PI
 #define M_PI 3.14159265358979323846

diff --git a/sql/item_func.h b/sql/item_func.h
@@ -32,6 +32,7 @@ extern "C"				/* Bug in BSDI include file */
 
 #include "sql_udf.h"    // udf_handler
 #include "my_decimal.h" // string2my_decimal
+#include <cmath>
 
 
 class Item_func :public Item_func_or_sum

diff --git a/storage/innobase/gis/gis0geo.cc b/storage/innobase/gis/gis0geo.cc
@@ -30,6 +30,7 @@ Created 2013/03/27 Allen Lai and Jimmy Yang
 #include "mach0data.h"
 
 #include <spatial.h>
+#include <cmath>
 
 /* These definitions are for comparing 2 mbrs. */
 

diff --git a/storage/innobase/gis/gis0rtree.cc b/storage/innobase/gis/gis0rtree.cc
@@ -38,6 +38,7 @@ Created 2013/03/27 Allen Lai and Jimmy Yang
 #include "trx0undo.h"
 #include "srv0mon.h"
 #include "gis0geo.h"
+#include <cmath>
 
 /*************************************************************//**
 Initial split nodes info for R-tree split.