diff options
| author | Buggynours <bertrandop@gmail.com> | 2015-03-03 12:39:42 +0100 |
|---|---|---|
| committer | Buggynours <bertrandop@gmail.com> | 2015-03-03 12:39:42 +0100 |
| commit | eb2f7638728b233b7e1976b69a372cc7fb3d2862 (patch) | |
| tree | 9a620ae8494da8a6f27389bebf9ba771e0e94451 | |
| parent | e33b48ae8b943b5d2aed4873f5ada7717860e162 (diff) | |
| download | mariadb-git-eb2f7638728b233b7e1976b69a372cc7fb3d2862.tar.gz | |
Add #include <ostream> in dict0mem.h and change iterator to const_iterator in dic0mem.cc
This fix compiling error when compiled with Visual Studio 9 2008
| -rw-r--r-- | storage/innobase/dict/dict0mem.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/include/dict0mem.h | 1 | ||||
| -rw-r--r-- | storage/xtradb/dict/dict0mem.cc | 2 | ||||
| -rw-r--r-- | storage/xtradb/include/dict0mem.h | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/storage/innobase/dict/dict0mem.cc b/storage/innobase/dict/dict0mem.cc index f0ea15d9513..0246b4060f1 100644 --- a/storage/innobase/dict/dict0mem.cc +++ b/storage/innobase/dict/dict0mem.cc @@ -772,7 +772,7 @@ dict_foreign_set_validate( { dict_foreign_not_exists not_exists(fk_set); - dict_foreign_set::iterator it = std::find_if( + dict_foreign_set::const_iterator it = std::find_if( fk_set.begin(), fk_set.end(), not_exists); if (it == fk_set.end()) { diff --git a/storage/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h index be0ef395ba8..c4c36ed2dae 100644 --- a/storage/innobase/include/dict0mem.h +++ b/storage/innobase/include/dict0mem.h @@ -50,6 +50,7 @@ Created 1/8/1996 Heikki Tuuri #include <set> #include <algorithm> #include <iterator> +#include <ostream> /* Forward declaration. */ struct ib_rbt_t; diff --git a/storage/xtradb/dict/dict0mem.cc b/storage/xtradb/dict/dict0mem.cc index 997e630dd15..033ef78b366 100644 --- a/storage/xtradb/dict/dict0mem.cc +++ b/storage/xtradb/dict/dict0mem.cc @@ -744,7 +744,7 @@ dict_foreign_set_validate( { dict_foreign_not_exists not_exists(fk_set); - dict_foreign_set::iterator it = std::find_if( + dict_foreign_set::const_iterator it = std::find_if( fk_set.begin(), fk_set.end(), not_exists); if (it == fk_set.end()) { diff --git a/storage/xtradb/include/dict0mem.h b/storage/xtradb/include/dict0mem.h index d3a713804f0..a054e122e44 100644 --- a/storage/xtradb/include/dict0mem.h +++ b/storage/xtradb/include/dict0mem.h @@ -53,6 +53,7 @@ Created 1/8/1996 Heikki Tuuri #include <set> #include <algorithm> #include <iterator> +#include <ostream> /* Forward declaration. */ struct ib_rbt_t; |