From 735b187a06f9dfe73ddb074421fc9672bfdccaeb Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Wed, 29 Oct 2003 22:13:16 -0800 Subject: [PATCH] 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 --- dev/etherpkt.hh | 6 +++--- 1 file 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 §ion); + void serialize(std::ostream &os); + void unserialize(Checkpoint *cp, const std::string §ion); }; typedef RefCountingPtr PacketPtr; -- 2.30.2