diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2012-06-29 13:25:57 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2012-06-29 13:25:57 +0200 |
| commit | 1ede2dd8146254951493081f2297b0832fdd4d13 (patch) | |
| tree | 2cb0c6d427fa7624b0acc5898cc6fd647152b6c2 /sql/log.h | |
| parent | 767501fb54f19adf3c136e5131daf11e34b3f039 (diff) | |
| download | mariadb-git-1ede2dd8146254951493081f2297b0832fdd4d13.tar.gz | |
Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)
This patch fixes various compilation warnings of the type
"error: narrowing conversion of 'x' from 'datatype1' to
'datatype2'
Diffstat (limited to 'sql/log.h')
| -rw-r--r-- | sql/log.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/log.h b/sql/log.h index 9ed5db04e87..02721f1ddd0 100644 --- a/sql/log.h +++ b/sql/log.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -294,8 +294,8 @@ class MYSQL_BIN_LOG: public TC_LOG, private MYSQL_LOG int new_file_impl(bool need_lock); public: - MYSQL_LOG::generate_name; - MYSQL_LOG::is_open; + using MYSQL_LOG::generate_name; + using MYSQL_LOG::is_open; /* This is relay log */ bool is_relay_log; |