diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2018-09-19 20:34:03 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2018-12-27 22:46:38 +0400 |
| commit | 03e461634d725a66917f8161443710f4338a5b1e (patch) | |
| tree | 0a9fc7cb1084b4311f9e9c36211e5920a81e48bd /storage/innobase/include | |
| parent | ca83115b3e77ffa696527d82640d5f16810294a2 (diff) | |
| download | mariadb-git-03e461634d725a66917f8161443710f4338a5b1e.tar.gz | |
MDEV-17441 - InnoDB transition to C++11 atomics
fil_validate_count transition to Atomic_counter.
Diffstat (limited to 'storage/innobase/include')
| -rw-r--r-- | storage/innobase/include/dict0dict.h | 1 | ||||
| -rw-r--r-- | storage/innobase/include/univ.i | 1 | ||||
| -rw-r--r-- | storage/innobase/include/ut0counter.h | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h index 3530f6bd4d2..8022b68434b 100644 --- a/storage/innobase/include/dict0dict.h +++ b/storage/innobase/include/dict0dict.h @@ -31,7 +31,6 @@ Created 1/8/1996 Heikki Tuuri #include "data0data.h" #include "dict0mem.h" #include "fsp0fsp.h" -#include <atomic> #include <deque> extern bool innodb_table_stats_not_found; diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index a3b50950393..66bfaf89142 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -83,6 +83,7 @@ used throughout InnoDB but do not include too much themselves. They support cross-platform development and expose comonly used SQL names. */ #include <my_global.h> +#include "my_counter.h" /* JAN: TODO: missing 5.7 header */ #ifdef HAVE_MY_THREAD_H diff --git a/storage/innobase/include/ut0counter.h b/storage/innobase/include/ut0counter.h index 653515a3d7d..1fc2c297e8d 100644 --- a/storage/innobase/include/ut0counter.h +++ b/storage/innobase/include/ut0counter.h @@ -29,7 +29,6 @@ Created 2012/04/12 by Sunny Bains #define ut0counter_h #include "os0thread.h" -#include <atomic> #include "my_rdtsc.h" /** CPU cache line size */ |