--- a/src/node/llc-snap-header.cc	Tue Aug 07 08:36:31 2007 +0200
+++ b/src/node/llc-snap-header.cc	Wed Aug 08 09:12:55 2007 +0200
@@ -38,8 +38,6 @@
 LlcSnapHeader::LlcSnapHeader ()
 {}
 
-LlcSnapHeader::~LlcSnapHeader ()
-{}
 void 
 LlcSnapHeader::SetType (uint16_t type)
 {
@@ -58,13 +56,13 @@
 }
 
 std::string
-LlcSnapHeader::DoGetName (void) const
+LlcSnapHeader::GetName (void) const
 {
   return "LLCSNAP";
 }
 
 void 
-LlcSnapHeader::PrintTo (std::ostream &os) const
+LlcSnapHeader::Print (std::ostream &os) const
 {
   os << "(type 0x";
   os.setf (std::ios::hex, std::ios::basefield);
@@ -74,7 +72,7 @@
 }
 
 void
-LlcSnapHeader::SerializeTo (Buffer::Iterator start) const
+LlcSnapHeader::Serialize (Buffer::Iterator start) const
 {
   Buffer::Iterator i = start;
   uint8_t buf[] = {0xaa, 0xaa, 0x03, 0, 0, 0};
@@ -82,7 +80,7 @@
   i.WriteHtonU16 (m_etherType);
 }
 uint32_t
-LlcSnapHeader::DeserializeFrom (Buffer::Iterator start)
+LlcSnapHeader::Deserialize (Buffer::Iterator start)
 {
   Buffer::Iterator i = start;
   i.Next (5+1);
@@ -91,4 +89,4 @@
 }
 
 
-}; // namespace ns3
+} // namespace ns3