Commit df88e7ce authored by Eugene Kosov's avatar Eugene Kosov

fix typedef-related warning and cleanup using namespace std

parent b30446c8
......@@ -38,6 +38,9 @@ Modified 30/07/2014 Jan Lindström jan.lindstrom@mariadb.com
#include <list>
using std::list;
using std::min;
/* When there's no work, either because defragment is disabled, or because no
query is submitted, thread checks state every BTR_DEFRAGMENT_SLEEP_IN_USECS.*/
#define BTR_DEFRAGMENT_SLEEP_IN_USECS 1000000
......
......@@ -1504,7 +1504,7 @@ buf_page_encrypt_before_write(
NOTE! The definition appears here only for other modules of this
directory (buf) to see it. Do not use from outside! */
typedef struct {
struct buf_tmp_buffer_t {
private:
int32 reserved; /*!< true if this slot is reserved
*/
......@@ -1534,7 +1534,7 @@ typedef struct {
return !my_atomic_fas32_explicit(&reserved, true,
MY_MEMORY_ORDER_RELAXED);
}
} buf_tmp_buffer_t;
};
/** The common buffer control block structure
for compressed and uncompressed frames */
......
......@@ -26,8 +26,6 @@ Created 2/2/1994 Heikki Tuuri
#ifndef page0types_h
#define page0types_h
using namespace std;
#include <map>
#include "univ.i"
......@@ -110,7 +108,7 @@ struct page_zip_stat_t {
};
/** Compression statistics types */
typedef map<index_id_t, page_zip_stat_t> page_zip_stat_per_index_t;
typedef std::map<index_id_t, page_zip_stat_t> page_zip_stat_per_index_t;
/** Statistics on compression, indexed by page_zip_des_t::ssize - 1 */
extern page_zip_stat_t page_zip_stat[PAGE_ZIP_SSIZE_MAX];
......
......@@ -28,9 +28,6 @@ Created June 2005 by Marko Makela
// First include (the generated) my_config.h, to get correct platform defines.
#include "my_config.h"
#include <map>
using namespace std;
#define THIS_MODULE
#include "page0zip.h"
#ifdef UNIV_NONINL
......
......@@ -807,7 +807,7 @@ row_create_prebuilt(
temp_index->fields[i].fixed_len;
}
}
srch_key_len = max(srch_key_len,temp_len);
srch_key_len = std::max(srch_key_len,temp_len);
}
ut_a(srch_key_len <= MAX_SRCH_KEY_VAL_BUFFER);
......
......@@ -1528,7 +1528,7 @@ buf_page_encrypt_before_write(
NOTE! The definition appears here only for other modules of this
directory (buf) to see it. Do not use from outside! */
typedef struct {
struct buf_tmp_buffer_t {
private:
int32 reserved; /*!< true if this slot is reserved
*/
......@@ -1558,7 +1558,7 @@ typedef struct {
return !my_atomic_fas32_explicit(&reserved, true,
MY_MEMORY_ORDER_RELAXED);
}
} buf_tmp_buffer_t;
};
/** The common buffer control block structure
for compressed and uncompressed frames */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment