From cddb65228f206be39e27a4cdd0fd1f9bb4d148b1 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 28 Aug 2004 10:32:27 +0400 Subject: Microsoft VC++ won't compile class C { static const int I=1; }. Putting initialization into .cc will reduce compiler's abilities to optimize this constant away. Defines are not OK as they bloat global namespace. Looking for a way to declare an efficient named constant in reduced namespace (i. e. in a class). Let's try enums: normally they should be implicitly casted to int. Let's see if we really have a compiler which won't do that. libmysqld/lib_sql.cc: Added explicit cast to int for Protocol::{SEND_DEFAULTS,SEND_NUM_ROWS, SEND_EOF} flags argument of send_fields() is now int. sql/protocol.cc: flags argument of send_fields is now int. sql/protocol.h: Catch22: Microsoft VC++ won't compile class C { static const int I=1; }. Putting initialization into .cc will reduce compiler's abilities to optimize this constant away. Defines are not OK as they bloat global namespace. Looking for a way to declare an efficient named constant in reduced namespace (i. e. in a class). Let's try enums: normally they should be implicitly casted to int. Let's see if we really have a compiler which won't do that. sql/protocol_cursor.cc: flags are now int. --- sql/protocol.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'sql/protocol.h') diff --git a/sql/protocol.h b/sql/protocol.h index 8dc2f506c6c..1a5896a3ae5 100644 --- a/sql/protocol.h +++ b/sql/protocol.h @@ -51,10 +51,8 @@ public: virtual ~Protocol() {} void init(THD* thd_arg); - static const uint SEND_NUM_ROWS= 1; - static const uint SEND_DEFAULTS= 2; - static const uint SEND_EOF= 4; - virtual bool send_fields(List *list, uint flags); + enum { SEND_NUM_ROWS= 1, SEND_DEFAULTS= 2, SEND_EOF= 4 }; + virtual bool send_fields(List *list, int flags); bool send_records_num(List *list, ulonglong records); bool store(I_List *str_list); @@ -168,7 +166,7 @@ public: prev_record= &data; return Protocol_simple::prepare_for_send(item_list); } - bool send_fields(List *list, uint flags); + bool send_fields(List *list, int flags); bool write(); uint get_field_count() { return field_count; } }; -- cgit v1.2.1