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/lib/common/ExcludeList.h

    r217 r353  
    2020#endif 
    2121 
     22class Archive; 
     23 
    2224// -------------------------------------------------------------------------- 
    2325// 
     
    3335        ExcludeList(); 
    3436        ~ExcludeList(); 
     37 
     38        void Deserialize(Archive & rArchive); 
     39        void Serialize(Archive & rArchive) const; 
    3540 
    3641        void AddDefiniteEntries(const std::string &rEntries); 
     
    5661#ifdef HAVE_REGEX_H 
    5762        std::vector<regex_t *> mRegex; 
     63        std::vector<std::string> mRegexStr;     // save original regular expression string-based source for Serialize 
    5864#endif 
    5965 
Note: See TracChangeset for help on using the changeset viewer.