Ignore:
Timestamp:
30/01/2006 20:04:53 (6 years ago)
Author:
ben
Message:

Merge chris/bb-save-state, resolving conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • box/trunk/bin/bbackupd/BackupClientDirectoryRecord.h

    r217 r353  
    1919#include "MD5Digest.h" 
    2020 
     21class Archive; 
    2122class BackupClientContext; 
    2223class BackupDaemon; 
     
    3536        BackupClientDirectoryRecord(int64_t ObjectID, const std::string &rSubDirName); 
    3637        ~BackupClientDirectoryRecord(); 
     38 
     39        void Deserialize(Archive & rArchive); 
     40        void Serialize(Archive & rArchive) const; 
    3741private: 
    3842        BackupClientDirectoryRecord(const BackupClientDirectoryRecord &); 
Note: See TracChangeset for help on using the changeset viewer.