mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-22 08:15:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Microsoft VC++ won't compile class C { static const int I=1; }.

Browse source 
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.
This commit is contained in:
unknown 2004-08-28 10:32:27 +04:00
commit ca37e1c377
4 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libmysqld/lib_sql.cc
View file

@ -568,7 +568,7 @@ err:
C_MODE_END C_MODE_END
bool Protocol::send_fields(List<Item> *list, uint flags) bool Protocol::send_fields(List<Item> *list, int flags)
{ {
List_iterator_fast<Item> it(*list); List_iterator_fast<Item> it(*list);
Item *item; Item *item;
@ -615,7 +615,7 @@ bool Protocol::send_fields(List<Item> *list, uint flags)
if (INTERNAL_NUM_FIELD(client_field)) if (INTERNAL_NUM_FIELD(client_field))
client_field->flags|= NUM_FLAG; client_field->flags|= NUM_FLAG;
if (flags & Protocol::SEND_DEFAULTS) if (flags & (int) Protocol::SEND_DEFAULTS)
{ {
char buff[80]; char buff[80];
String tmp(buff, sizeof(buff), default_charset_info), *res; String tmp(buff, sizeof(buff), default_charset_info), *res;

2
sql/protocol.cc
View file

@ -498,7 +498,7 @@ void Protocol::init(THD *thd_arg)
*/ */
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
bool Protocol::send_fields(List<Item> *list, uint flags) bool Protocol::send_fields(List<Item> *list, int flags)
{ {
List_iterator_fast<Item> it(*list); List_iterator_fast<Item> it(*list);
Item *item; Item *item;

8
sql/protocol.h
View file

@ -51,10 +51,8 @@ public:
virtual ~Protocol() {} virtual ~Protocol() {}
void init(THD* thd_arg); void init(THD* thd_arg);
static const uint SEND_NUM_ROWS= 1; enum { SEND_NUM_ROWS= 1, SEND_DEFAULTS= 2, SEND_EOF= 4 };
static const uint SEND_DEFAULTS= 2; virtual bool send_fields(List<Item> *list, int flags);
static const uint SEND_EOF= 4;
virtual bool send_fields(List<Item> *list, uint flags);
bool send_records_num(List<Item> *list, ulonglong records); bool send_records_num(List<Item> *list, ulonglong records);
bool store(I_List<i_string> *str_list); bool store(I_List<i_string> *str_list);
@ -168,7 +166,7 @@ public:
prev_record= &data; prev_record= &data;
return Protocol_simple::prepare_for_send(item_list); return Protocol_simple::prepare_for_send(item_list);
} }
bool send_fields(List<Item> *list, uint flags); bool send_fields(List<Item> *list, int flags);
bool write(); bool write();
uint get_field_count() { return field_count; } uint get_field_count() { return field_count; }
}; };

4
sql/protocol_cursor.cc
View file

@ -26,7 +26,7 @@
#include "mysql_priv.h" #include "mysql_priv.h"
#include <mysql.h> #include <mysql.h>
bool Protocol_cursor::send_fields(List<Item> *list, uint flags) bool Protocol_cursor::send_fields(List<Item> *list, int flags)
{ {
List_iterator_fast<Item> it(*list); List_iterator_fast<Item> it(*list);
Item *item; Item *item;
@ -67,7 +67,7 @@ bool Protocol_cursor::send_fields(List<Item> *list, uint flags)
if (INTERNAL_NUM_FIELD(client_field)) if (INTERNAL_NUM_FIELD(client_field))
client_field->flags|= NUM_FLAG; client_field->flags|= NUM_FLAG;
if (flags & Protocol::SEND_DEFAULTS) if (flags & (int) Protocol::SEND_DEFAULTS)
{ {
char buff[80]; char buff[80];
String tmp(buff, sizeof(buff), default_charset_info), *res; String tmp(buff, sizeof(buff), default_charset_info), *res;