summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-06-10 12:36:27 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-06-10 12:36:27 +0200
commit74a3907be285891d90b82e2d315d03141a398752 (patch)
treed230cdc2f2dd30f4b462f8857aa41a69be7b25b0
parent8782b4d696da7b1527f69e819d75d691bc3df105 (diff)
couple of ICC warnings fixed
-rw-r--r--src/encoder.hpp2
-rw-r--r--src/uuid.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/encoder.hpp b/src/encoder.hpp
index 995802f..0d5b6ba 100644
--- a/src/encoder.hpp
+++ b/src/encoder.hpp
@@ -52,7 +52,7 @@ namespace zmq
// The destructor doesn't have to be virtual. It is mad virtual
// just to keep ICC and code checking tools from complaining.
- inline ~encoder_t ()
+ inline virtual ~encoder_t ()
{
free (buf);
}
diff --git a/src/uuid.cpp b/src/uuid.cpp
index 406bbb4..f1dddf0 100644
--- a/src/uuid.cpp
+++ b/src/uuid.cpp
@@ -190,8 +190,10 @@ unsigned char zmq::uuid_t::convert_byte (const char *hexa_)
byte = *hexa_ - 'A' + 10;
else if (*hexa_ >= 'a' && *hexa_ <= 'f')
byte = *hexa_ - 'a' + 10;
- else
+ else {
zmq_assert (false);
+ byte = 0;
+ }
byte *= 16;