couple of ICC warnings fixed

This commit is contained in:
Martin Sustrik 2010-06-10 12:36:27 +02:00
parent 8782b4d696
commit 74a3907be2
2 changed files with 4 additions and 2 deletions

View File

@ -52,7 +52,7 @@ namespace zmq
// The destructor doesn't have to be virtual. It is mad virtual // The destructor doesn't have to be virtual. It is mad virtual
// just to keep ICC and code checking tools from complaining. // just to keep ICC and code checking tools from complaining.
inline ~encoder_t () inline virtual ~encoder_t ()
{ {
free (buf); free (buf);
} }

View File

@ -190,8 +190,10 @@ unsigned char zmq::uuid_t::convert_byte (const char *hexa_)
byte = *hexa_ - 'A' + 10; byte = *hexa_ - 'A' + 10;
else if (*hexa_ >= 'a' && *hexa_ <= 'f') else if (*hexa_ >= 'a' && *hexa_ <= 'f')
byte = *hexa_ - 'a' + 10; byte = *hexa_ - 'a' + 10;
else else {
zmq_assert (false); zmq_assert (false);
byte = 0;
}
byte *= 16; byte *= 16;