summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-06-10 07:21:05 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-06-10 07:21:05 +0200
commit76e0153d4f3ef1d5fef1a9b926e0e8e3ab2d9685 (patch)
tree1acb079853898a962c5fbd316b22581f3c3ee481
parentd329c55da9c503e82831e940b0fc8dc9e5479975 (diff)
issue 33 - missing virtual destructors
-rw-r--r--src/decoder.hpp4
-rw-r--r--src/encoder.hpp2
-rw-r--r--src/yarray_item.hpp4
-rw-r--r--src/ypipe.hpp6
4 files changed, 14 insertions, 2 deletions
diff --git a/src/decoder.hpp b/src/decoder.hpp
index 1662bda..f05f651 100644
--- a/src/decoder.hpp
+++ b/src/decoder.hpp
@@ -55,7 +55,9 @@ namespace zmq
zmq_assert (buf);
}
- inline ~decoder_t ()
+ // The destructor doesn't have to be virtual. It is mad virtual
+ // just to keep ICC and code checking tools from complaining.
+ inline virtual ~decoder_t ()
{
free (buf);
}
diff --git a/src/encoder.hpp b/src/encoder.hpp
index 10fe912..995802f 100644
--- a/src/encoder.hpp
+++ b/src/encoder.hpp
@@ -50,6 +50,8 @@ namespace zmq
zmq_assert (buf);
}
+ // 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 ()
{
free (buf);
diff --git a/src/yarray_item.hpp b/src/yarray_item.hpp
index b6d89cc..db24dda 100644
--- a/src/yarray_item.hpp
+++ b/src/yarray_item.hpp
@@ -35,7 +35,9 @@ namespace zmq
{
}
- inline ~yarray_item_t ()
+ // The destructor doesn't have to be virtual. It is mad virtual
+ // just to keep ICC and code checking tools from complaining.
+ inline virtual ~yarray_item_t ()
{
}
diff --git a/src/ypipe.hpp b/src/ypipe.hpp
index df5b3d0..2a2d725 100644
--- a/src/ypipe.hpp
+++ b/src/ypipe.hpp
@@ -50,6 +50,12 @@ namespace zmq
c.set (&queue.back ());
}
+ // The destructor doesn't have to be virtual. It is mad virtual
+ // just to keep ICC and code checking tools from complaining.
+ inline virtual ~ypipe_t ()
+ {
+ }
+
// Following function (write) deliberately copies uninitialised data
// when used with zmq_msg. Initialising the VSM body for
// non-VSM messages won't be good for performance.