7d6
< //#include <map>
9d7
< //#include <fstream>
11c9
< #include "FssimApp.h"
---
> #include "GroupStruct.h"
15a14
> 
19,20d17
<     enum { LABEL_SIZE = FssimApp::MAX_LABEL_LENGTH };
< 
22,23c19,20
<     Group(GROUP* pGroupStruct = 0) : m_pStruct(pGroupStruct) { }
<     virtual ~Group(); // destructor
---
>     Group(GroupStruct* pGroupStruct = 0) : m_pStruct(pGroupStruct) { }
>     virtual ~Group() {} // destructor
28,30c25,27
<     bool hasGroupDefs() { return (0 != m_pStruct->groupdefs); }
<     bool hasTransfers() { return (0 != m_pStruct->transferlist); }
<     bool hasAxsDefs() { return (0 != m_pStruct->axslist); }
---
>     bool hasGroupDefs() { return !(m_pStruct->groupdefs.empty()); }
>     bool hasTransfers() { return !(m_pStruct->transferlist.empty()); }
>     bool hasAxsDefs() { return !(m_pStruct->axslist.empty()); }
32c29
<     GROUP* getStruct() { return m_pStruct; }
---
>     GroupStruct* getStruct() { return m_pStruct; }
34c31
<     static GROUP* lookupGROUPAddress(int id)
---
>     static GroupStruct* lookupGroupStructAddress(int id)
42c39
<     void serializeTransferList(Serializer& binaryArchive);
---
>     //void serializeTransferList(Serializer& binaryArchive);
48c45
<     GROUP* m_pStruct;
---
>     GroupStruct* m_pStruct;
56c53,55
<     static vector<GROUP*> m_structMemoryAddresses;
---
>     // transfers are not serialized by group
> 
>     static vector<GroupStruct*> m_structMemoryAddresses;