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/BackupDaemon.h

    r217 r353  
    1515#include <memory> 
    1616 
     17#include "BoxTime.h" 
    1718#include "Daemon.h" 
    18 #include "BoxTime.h" 
    1919#include "Socket.h" 
    2020#include "SocketListen.h" 
     
    2828class ExcludeList; 
    2929class IOStreamGetLine; 
     30class Archive; 
    3031 
    3132// -------------------------------------------------------------------------- 
     
    4243        BackupDaemon(); 
    4344        ~BackupDaemon(); 
     45 
     46        // methods below do partial (specialized) serialization of client state only 
     47        void SerializeStoreObjectInfo(int64_t aClientStoreMarker, box_time_t theLastSyncTime, box_time_t theNextSyncTime) const; 
     48        void DeserializeStoreObjectInfo(int64_t & aClientStoreMarker, box_time_t & theLastSyncTime, box_time_t & theNextSyncTime); 
    4449private: 
    4550        BackupDaemon(const BackupDaemon &); 
     
    118123                Location(); 
    119124                ~Location(); 
     125 
     126                void Deserialize(Archive & rArchive); 
     127                void Serialize(Archive & rArchive) const; 
    120128        private: 
    121129                Location(const Location &);     // copy not allowed 
Note: See TracChangeset for help on using the changeset viewer.