From d6c3f0f4b6529a1389b11c3c62dc3506f1ea514d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 22 Aug 2005 18:59:47 +0400 Subject: [PATCH 1/2] Fix a -ansi -pedantic compile failure. --- server-tools/instance-manager/instance.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-tools/instance-manager/instance.h b/server-tools/instance-manager/instance.h index ee37690d40a..cbcfee0c7ef 100644 --- a/server-tools/instance-manager/instance.h +++ b/server-tools/instance-manager/instance.h @@ -42,7 +42,7 @@ public: void kill_instance(int signo); int is_crashed(); void set_crash_flag_n_wake_all(); - Instance_map *Instance::get_map(); + Instance_map *get_map(); public: enum { DEFAULT_SHUTDOWN_DELAY= 35 }; From 0b4ec2fb427b242b2522f16b870933e10ce1a716 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 22 Aug 2005 19:23:01 +0400 Subject: [PATCH 2/2] Add a comment about I_List<> copy constructor. sql/sql_list.h: Add a comment. --- sql/sql_list.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sql/sql_list.h b/sql/sql_list.h index 09c01931c38..e4a34cc0aa1 100644 --- a/sql/sql_list.h +++ b/sql/sql_list.h @@ -426,9 +426,14 @@ struct ilink template class I_List_iterator; +/* + WARNING: copy constructor of this class does not create a usable + copy, as its members may point at each other. +*/ + class base_ilist { - public: +public: struct ilink *first,last; inline void empty() { first= &last; last.prev= &first; } base_ilist() { empty(); }