diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2018-05-25 22:57:49 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2018-05-26 13:31:12 +0400 |
| commit | aeaac6ca76a1a7cfd1fcd5b1b82077e3911398ef (patch) | |
| tree | 4f1500189c98558d5a722a5138f009672a5225a8 | |
| parent | 8f888ab1d82205ec45165fa23d21cffc4d1ef8a1 (diff) | |
| download | mariadb-git-aeaac6ca76a1a7cfd1fcd5b1b82077e3911398ef.tar.gz | |
moved include <cmath> from my_global.h
| -rw-r--r-- | include/my_global.h | 4 | ||||
| -rw-r--r-- | sql/item_func.h | 1 | ||||
| -rw-r--r-- | storage/innobase/gis/gis0geo.cc | 1 | ||||
| -rw-r--r-- | storage/innobase/gis/gis0rtree.cc | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/include/my_global.h b/include/my_global.h index 8fa4429bdbf..7bf0ee43186 100644 --- 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 index 14f8e96d061..049ef82f71e 100644 --- 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 index 88967859d46..71d637d62d5 100644 --- 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 index 2d9824b355a..eac904e5b24 100644 --- 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. |