Merge Steve & Erik's etherdev & scsi changes with mine (specifically

new arg type for unserialize()).

dev/etherpkt.hh:
    unserialize() takes Checkpoint* instead of IniFile* now.

--HG--
extra : convert_revision : 21b9d97350a591b0f95d84f6c0cfcdfa0b28d714

1 files changed, 3 insertions, 3 deletions

diff --git a/dev/etherpkt.hh b/dev/etherpkt.hh
index 030f51317..c91322526 100644
--- a/dev/etherpkt.hh
+++ b/dev/etherpkt.hh
@@ -39,7 +39,7 @@
 
 #include "base/refcnt.hh"
 
-class IniFile;
+class Checkpoint;
 
 /*
  * Reference counted class containing ethernet packet data
@@ -61,8 +61,8 @@ class EtherPacket : public RefCounted
     bool IsMulticast() { return data[0] == 0x01; }
     bool IsBroadcast() { return data[0] == 0xff; }
 
-    virtual void serialize(std::ostream &os);
-    virtual void unserialize(const IniFile *db, const std::string &section);
+    void serialize(std::ostream &os);
+    void unserialize(Checkpoint *cp, const std::string &section);
 };
 
 typedef RefCountingPtr<EtherPacket> PacketPtr;