6,9d5
< //#include <list>
< //#include <map>
< //#include <fstream>
< 
11a8,9
> #include "GroupDefStruct.h"
> #include "GroupStruct.h"
13,14d10
< using namespace std;
< using namespace tsb;
17d12
< 
21,22d15
<     enum { LABEL_SIZE = FssimApp::MAX_LABEL_LENGTH };
< 
24,25c17,18
<     GroupDef(GROUPDEF* pGROUPDEFStruct = 0, GROUP* pGroup = 0)
<         : m_pStruct(pGROUPDEFStruct), m_pGroup(pGroup) { }
---
>     GroupDef(GroupDefStruct* pGROUPDEFStruct = 0, GroupStruct* pGroup = 0)
>         : m_pStruct(pGROUPDEFStruct), m_pGroup(pGroup) {}
27c20
<     virtual ~GroupDef(); // destructor
---
>     virtual ~GroupDef() {} // destructor
31c24
<     GROUPDEF* getStruct() { return m_pStruct; }
---
>     GroupDefStruct* getStruct() { return m_pStruct; }
33,34c26
<     void recreateStruct(/*GROUP *group, */ // passed from member variable
<                         char *zone, char *au, char *block, int low_age, int high_age, int ctype);
---
>     void recreateStruct(int zone, int au, int block, int low_age, int high_age, int ctype);
37c29
<     GROUPDEF* m_pStruct;
---
>     GroupDefStruct* m_pStruct;
40c32
<     GROUP* m_pGroup; // each GroupDef is owned by a group
---
>     GroupStruct* m_pGroup; // each GroupDef is owned by a group