Index: src/ch/DataBuffer.h =================================================================== diff -u -N -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r5057e08b0cc064972abeb94a488e5f12d9db14a0 --- src/ch/DataBuffer.h (.../DataBuffer.h) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/DataBuffer.h (.../DataBuffer.h) (revision 5057e08b0cc064972abeb94a488e5f12d9db14a0) @@ -19,8 +19,6 @@ #ifndef __DATABUFFER_H__ #define __DATABUFFER_H__ -#include "../libicpf/file.h" - #define DEFAULT_SIZE 65536 #define ROUNDTODS(number)\ @@ -41,8 +39,19 @@ #pragma warning (disable: 4201) struct BUFFERSIZES { - void Serialize(icpf::archive& ar); + template + void serialize(Archive& ar, unsigned int /*uiVersion*/) + { + ar & m_uiDefaultSize; + ar & m_uiOneDiskSize; + ar & m_uiTwoDisksSize; + ar & m_uiCDSize; + ar & m_uiLANSize; + ar & m_bOnlyDefault; + } + bool operator==(const BUFFERSIZES& bsSizes) const; + union { struct @@ -78,6 +87,7 @@ // operators operator unsigned char*() { return m_pBuffer; }; + protected: unsigned char *m_pBuffer; // buffer address UINT m_uiRealSize; // real buffer size