File mysql-gui-tools-gcc-6.patch of Package mysql-gui-tools
From 6e2aba7539ad256ec9349690645a0c2c9df1daf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Volker=20H=C3=A4rtel?= <cyberbeat@gmx.de>
Date: Fri, 17 Mar 2017 16:26:54 +0100
Subject: [PATCH 1/6] Fix gcc-6 problem
---
common/library/utilities/include/myx_util_functions.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/library/utilities/include/myx_util_functions.h b/common/library/utilities/include/myx_util_functions.h
index 38d4ea2..9c11673 100755
--- a/common/library/utilities/include/myx_util_functions.h
+++ b/common/library/utilities/include/myx_util_functions.h
@@ -98,8 +98,8 @@ extern "C" {
typedef __int64 longlong;
typedef unsigned __int64 ulonglong;
#else
-# define min(a,b) ((a)<(b)?(a):(b))
-# define max(a,b) ((a)>(b)?(a):(b))
+// # define min(a,b) ((a)<(b)?(a):(b))
+// # define max(a,b) ((a)>(b)?(a):(b))
typedef unsigned char uint8;
typedef unsigned char uchar;
--
2.12.0
From 830ab4f80f66ef557b6ea0e803648192bc253648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Volker=20H=C3=A4rtel?= <cyberbeat@gmx.de>
Date: Fri, 17 Mar 2017 17:42:43 +0100
Subject: [PATCH 2/6] Fix for gcc6
---
common/library/generic-runtime/source/myx_grt_lua_shell_help.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/library/generic-runtime/source/myx_grt_lua_shell_help.c b/common/library/generic-runtime/source/myx_grt_lua_shell_help.c
index e4a3f2a..9dfc004 100755
--- a/common/library/generic-runtime/source/myx_grt_lua_shell_help.c
+++ b/common/library/generic-runtime/source/myx_grt_lua_shell_help.c
@@ -1948,7 +1948,7 @@ void myx_grt_shell_show_command_help_print(MYX_GRT *grt, const char *group_name,
char ul[80];
unsigned int k;
- for (k= 0; k < min(strlen(help_group.group_caption) + strlen(help_group.group_name) + 3, 79); k++)
+ for (k= 0; k < MIN(strlen(help_group.group_caption) + strlen(help_group.group_name) + 3, 79); k++)
ul[k]= '-';
ul[k]= 0;
@@ -1989,7 +1989,7 @@ void myx_grt_shell_show_command_help_print(MYX_GRT *grt, const char *group_name,
char ul[80];
unsigned int k;
- for (k= 0; k < min(strlen(help_group.group_caption) + strlen(help_group.group_name) + strlen(help_text.cmd) + 4, 79); k++)
+ for (k= 0; k < MIN(strlen(help_group.group_caption) + strlen(help_group.group_name) + strlen(help_text.cmd) + 4, 79); k++)
ul[k]= '-';
ul[k]= 0;
--
2.12.0
From 2797a44d55e07eae056d59d28c6c38f4e1094637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Volker=20H=C3=A4rtel?= <cyberbeat@gmx.de>
Date: Sat, 18 Mar 2017 19:28:41 +0100
Subject: [PATCH 3/6] more gcc6 fixes
---
administrator/source/linux/MAdministrator.cc | 2 +-
common/library/base-library/source/myx_query.cpp | 2 +-
common/library/base-library/source/myx_shell.c | 8 ++++----
common/library/grt-modules/source/myx_grt_mysql_query.c | 8 ++++----
common/library/grt-wb-controller/source/myx_grt_wb_controller.cc | 8 ++++----
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/administrator/source/linux/MAdministrator.cc b/administrator/source/linux/MAdministrator.cc
index 2fbba73..821ad51 100755
--- a/administrator/source/linux/MAdministrator.cc
+++ b/administrator/source/linux/MAdministrator.cc
@@ -328,7 +328,7 @@ void MAdministrator::show()
{
_tree->get_background_area(Gtk::TreePath(iter),
*_tree->get_column(0), rect);
- w= max(w, rect.get_width());
+ w= std::max(w, rect.get_width());
h += rect.get_height();
}
diff --git a/common/library/base-library/source/myx_query.cpp b/common/library/base-library/source/myx_query.cpp
index 670eef6..ecc91df 100755
--- a/common/library/base-library/source/myx_query.cpp
+++ b/common/library/base-library/source/myx_query.cpp
@@ -3267,7 +3267,7 @@ MYX_IMAGE_FORMAT myx_guess_image_format(const void *data, unsigned int length)
for (Image_format * format= file_headers; format!=file_headers_end; format++)
{
if (memcmp(format->name.data(), data,
- min((size_t)length, format->name.length()))==0)
+ std::min((size_t)length, format->name.length()))==0)
{
return format->format;
};
diff --git a/common/library/base-library/source/myx_shell.c b/common/library/base-library/source/myx_shell.c
index 1cb11e8..26e84a4 100755
--- a/common/library/base-library/source/myx_shell.c
+++ b/common/library/base-library/source/myx_shell.c
@@ -87,7 +87,7 @@ static void show_result(MYX_TEXT_SHELL *shell, MYSQL_RES *res)
if (field == NULL)
break;
- length= max(length,field->max_length);
+ length= MAX(length,field->max_length);
length*= 2; //consider UTF8 2-byte chars
if (length < 4 && !IS_NOT_NULL(field->flags))
length=4; // Room for "NULL"
@@ -107,7 +107,7 @@ static void show_result(MYX_TEXT_SHELL *shell, MYSQL_RES *res)
if (field == NULL)
break;
- fill_char(line_sep+strlen(line_sep), '-', min((int)field->max_length+1, MAX_COLUMN_LENGTH+1));
+ fill_char(line_sep+strlen(line_sep), '-', MIN((int)field->max_length+1, MAX_COLUMN_LENGTH+1));
strcat(line_sep,"+");
}
while (1);
@@ -132,7 +132,7 @@ static void show_result(MYX_TEXT_SHELL *shell, MYSQL_RES *res)
field_name= myx_convert_dbstr_utf8(shell->mysql, field->name, -1);
- sprintf(line, " %-*s|",min((int)field->max_length,MAX_COLUMN_LENGTH),
+ sprintf(line, " %-*s|",MIN((int)field->max_length,MAX_COLUMN_LENGTH),
field_name);
g_free(field_name);
@@ -194,7 +194,7 @@ static void show_result(MYX_TEXT_SHELL *shell, MYSQL_RES *res)
else
{
line_end+= sprintf(line_end, IS_NUM(field->type) ? "%*s |" : " %-*s|",
- min(length, MAX_COLUMN_LENGTH+clength-u8length), field_value);
+ MIN(length, MAX_COLUMN_LENGTH+clength-u8length), field_value);
//line_end+= strlen(line_end);
}
diff --git a/common/library/grt-modules/source/myx_grt_mysql_query.c b/common/library/grt-modules/source/myx_grt_mysql_query.c
index 3b37cb0..8db9623 100755
--- a/common/library/grt-modules/source/myx_grt_mysql_query.c
+++ b/common/library/grt-modules/source/myx_grt_mysql_query.c
@@ -151,7 +151,7 @@ MYX_GRT_VALUE * query_print(MYX_GRT_VALUE *param, void *data)
unsigned int length= field->name_length;
#endif
- length= max(length,field->max_length);
+ length= MAX(length,field->max_length);
length*= 2; //consider UTF8 2-byte chars
if (length < 4 && !IS_NOT_NULL(field->flags))
length=4; // Room for "NULL"
@@ -166,7 +166,7 @@ MYX_GRT_VALUE * query_print(MYX_GRT_VALUE *param, void *data)
mysql_field_seek(res, 0);
while ((field= mysql_fetch_field(res)))
{
- fill_char(line_sep+strlen(line_sep), '-', min((int)field->max_length+1, MAX_COLUMN_LENGTH+1));
+ fill_char(line_sep+strlen(line_sep), '-', MIN((int)field->max_length+1, MAX_COLUMN_LENGTH+1));
strcat(line_sep,"+");
}
myx_grt_messages_stack_add(grt, 0, line_sep, NULL, 0, -1);
@@ -181,7 +181,7 @@ MYX_GRT_VALUE * query_print(MYX_GRT_VALUE *param, void *data)
{
char *field_name= myx_convert_dbstr_utf8(mysql_conn->mysql, field->name, field->name_length);
- sprintf(buf, " %-*s|", min((int)field->max_length, MAX_COLUMN_LENGTH),
+ sprintf(buf, " %-*s|", MIN((int)field->max_length, MAX_COLUMN_LENGTH),
field_name);
line= str_g_append(line, buf);
@@ -246,7 +246,7 @@ MYX_GRT_VALUE * query_print(MYX_GRT_VALUE *param, void *data)
else
{
line_end+= sprintf(line_end, IS_NUM(field->type) ? "%*s |" : " %-*s|",
- min(length, MAX_COLUMN_LENGTH+clength-u8length), field_value);
+ MIN(length, MAX_COLUMN_LENGTH+clength-u8length), field_value);
//line_end+= strlen(line_end);
}
diff --git a/common/library/grt-wb-controller/source/myx_grt_wb_controller.cc b/common/library/grt-wb-controller/source/myx_grt_wb_controller.cc
index 9116c6c..b7628bd 100755
--- a/common/library/grt-wb-controller/source/myx_grt_wb_controller.cc
+++ b/common/library/grt-wb-controller/source/myx_grt_wb_controller.cc
@@ -1287,9 +1287,9 @@ void CanvasViewController::autoArrangeElements(bool selectedOnly)
double newx= iter->second->newleft();
double newy= iter->second->newtop();
- bottom_y= max(newy + iter->second->height(), bottom_y);
- left_x= min(newx, left_x);
- right_x= max(newx + iter->second->width(), right_x);
+ bottom_y= std::max(newy + iter->second->height(), bottom_y);
+ left_x= std::min(newx, left_x);
+ right_x= std::max(newx + iter->second->width(), right_x);
iter->first->moveTo(newx, newy);
};
@@ -1331,7 +1331,7 @@ void CanvasViewController::autoArrangeElements(bool selectedOnly)
(*iter)->moveTo(x, y);
x+= bounds.width() + spacing;
- row_height= max((double)bounds.height(), row_height);
+ row_height= std::max((double)bounds.height(), row_height);
i++;
if (x >= right_x)
{
--
2.12.0
From f3b13343d2221ea161158681c4e9b967b2182a12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Volker=20H=C3=A4rtel?= <cyberbeat@gmx.de>
Date: Sat, 18 Mar 2017 20:18:10 +0100
Subject: [PATCH 4/6] more gcc 6 fixes
---
common/source/linux/myg_utils.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/source/linux/myg_utils.h b/common/source/linux/myg_utils.h
index 8cd3e48..b6d38e6 100755
--- a/common/source/linux/myg_utils.h
+++ b/common/source/linux/myg_utils.h
@@ -72,7 +72,7 @@ Glib::ustring strreplace(const Glib::ustring &str,const Glib::ustring &from,cons
#if __GNUC__ < 3
#define myg_log(msg, args...) g_printerr("%s: "msg"\n", g_get_prgname(), args)
#else
-#define myg_log(msg, ...) g_printerr("%s: "msg"\n", g_get_prgname(), ## __VA_ARGS__)
+#define myg_log(msg, ...) g_printerr("%s: " msg "\n", g_get_prgname(), ## __VA_ARGS__)
#endif
#endif /* _MYG_UTILS_H_ */
--
2.12.0
From 7adb1eb608e7c87ec7b57a5567bd96f63dfbbd58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Volker=20H=C3=A4rtel?= <cyberbeat@gmx.de>
Date: Sat, 18 Mar 2017 21:08:17 +0100
Subject: [PATCH 5/6] gtkmm update
---
query-browser/source/linux/MQQueryDispatcher.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/query-browser/source/linux/MQQueryDispatcher.cc b/query-browser/source/linux/MQQueryDispatcher.cc
index fe81348..cfe951b 100755
--- a/query-browser/source/linux/MQQueryDispatcher.cc
+++ b/query-browser/source/linux/MQQueryDispatcher.cc
@@ -22,7 +22,7 @@
#include "MGMySQLConsole.h"
-#include <sigc++/class_slot.h>
+//#include <sigc++/class_slot.h>
#include <gtkmm/main.h>
--
2.12.0
From bfd217088dec425101a05fc3e8b8d05060f15064 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Volker=20H=C3=A4rtel?= <cyberbeat@gmx.de>
Date: Sat, 18 Mar 2017 23:34:08 +0100
Subject: [PATCH 6/6] fix hex editor, more gcc6 changes
---
common/source/linux/MGBlobEditor.cc | 2 +-
query-browser/source/linux/MQWorkArea.cc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/source/linux/MGBlobEditor.cc b/common/source/linux/MGBlobEditor.cc
index 14b58c5..5eb2d45 100755
--- a/common/source/linux/MGBlobEditor.cc
+++ b/common/source/linux/MGBlobEditor.cc
@@ -22,7 +22,7 @@
#include "mygpriv.h"
-class MGBlobListStore : public Glib::Object, public Gtk::TreeModel
+class MGBlobListStore : public Gtk::TreeModel, public Glib::Object
{
protected:
virtual bool iter_is_valid(const Gtk::TreeModel::iterator& iter) const;
diff --git a/query-browser/source/linux/MQWorkArea.cc b/query-browser/source/linux/MQWorkArea.cc
index 86479dc..604682d 100755
--- a/query-browser/source/linux/MQWorkArea.cc
+++ b/query-browser/source/linux/MQWorkArea.cc
@@ -109,7 +109,7 @@ class DropDataReceivedProxyHack : public Glib::ObjectBase {
if (prefs.default_limit_value > 0)
query+=" LIMIT 0,"+tostr(prefs.default_limit_value);
- warea->execute_query(catalog, schema, query, false);
+ warea->execute_query(catalog, schema, query, 0, false);
}
}
else
@@ -3522,7 +3522,7 @@ void MQWorkArea::execute_query(const Glib::ustring &catalog, const Glib::ustring
void MQWorkArea::open_bookmark(MQBookmarks::BookmarkItem *bookmark)
{
- execute_query(bookmark->catalog, bookmark->schema, bookmark->query, false);
+ execute_query(bookmark->catalog, bookmark->schema, bookmark->query, 0, false);
}
--
2.12.0
