--- a/src/common/header.cc Mon Dec 04 13:51:42 2006 +0100
+++ b/src/common/header.cc Tue Dec 05 10:08:27 2006 +0100
@@ -25,7 +25,11 @@
namespace ns3 {
Header::Header ()
- : m_isDeserialized (false) {}
+ : m_isDeserialized (false)
+{}
+
+Header::~Header ()
+{}
void
Header::Print (std::ostream &os) const
@@ -54,11 +58,6 @@
return m_isDeserialized;
}
-
-
-Header::~Header ()
-{}
-
std::ostream& operator<< (std::ostream& os, Header const& header)
{
header.Print (os);
--- a/src/common/header.h Mon Dec 04 13:51:42 2006 +0100
+++ b/src/common/header.h Tue Dec 05 10:08:27 2006 +0100
@@ -42,10 +42,7 @@
class Header {
public:
Header ();
- /**
- * Derived classes must provide an explicit virtual destructor
- */
- virtual ~Header () = 0;
+ virtual ~Header ();
void Print (std::ostream &os) const;
uint32_t GetSize (void) const;
--- a/src/common/trailer.cc Mon Dec 04 13:51:42 2006 +0100
+++ b/src/common/trailer.cc Tue Dec 05 10:08:27 2006 +0100
@@ -25,7 +25,11 @@
namespace ns3 {
Trailer::Trailer ()
- : m_isDeserialized (false) {}
+ : m_isDeserialized (false)
+{}
+
+Trailer::~Trailer ()
+{}
void
Trailer::Print (std::ostream &os) const
@@ -54,11 +58,6 @@
return m_isDeserialized;
}
-
-
-Trailer::~Trailer ()
-{}
-
std::ostream& operator<< (std::ostream& os, Trailer const& trailer)
{
trailer.Print (os);
--- a/src/common/trailer.h Mon Dec 04 13:51:42 2006 +0100
+++ b/src/common/trailer.h Tue Dec 05 10:08:27 2006 +0100
@@ -42,10 +42,7 @@
class Trailer {
public:
Trailer ();
- /**
- * Derived classes must provide an explicit virtual destructor
- */
- virtual ~Trailer () = 0;
+ virtual ~Trailer ();
void Print (std::ostream &os) const;
uint32_t GetSize (void) const;