[OpenSBC] compile errors : B2BUAConnection.h revision 1.70

[Jack D. <455...@gm...>]

Changes to B2BUAConnection.h in revision 1.70 is giving me following
errors when compiling CVS opensbc:
(Solaris 10 with GCC 3.4.3 from Sun).  Please help, had no issues before.

Thanks.
-JD

#######################################################

gmake optnoshared

gmake P_SHAREDLIB=0 opt
gmake[1]: Entering directory `/d65/src/opensbc'
g++ -DP_USE_PRAGMA -DFD_SETSIZE=16384 -D_REENTRANT -DP_USE_PRAGMA
-DFD_SETSIZE=16384 -D_REENTRANT -Wall  -I/d65/src/opensipstack/include
-DPTRACING -I/d65/src/opensipstack/include -O3  -DSOLARIS  -c Main.cxx
-o obj_solaris_sparc_r/Main.o
g++ -DP_USE_PRAGMA -DFD_SETSIZE=16384 -D_REENTRANT -DP_USE_PRAGMA
-DFD_SETSIZE=16384 -D_REENTRANT -Wall  -I/d65/src/opensipstack/include
-DPTRACING -I/d65/src/opensipstack/include -O3  -DSOLARIS  -c
SBCCallHandler.cxx -o obj_solaris_sparc_r/SBCCallHandler.o
In file included from RouteRecord.h:86,
                 from Router.h:124,
                 from SBCRoutingHandler.h:127,
                 from SBCCallHandler.cxx:123:
/d65/src/opensipstack/include/B2BUAConnection.h:795: error: ISO C++
forbids declaration of `map' with no type
/d65/src/opensipstack/include/B2BUAConnection.h:795: error: expected
`;' before '<' token
/d65/src/opensipstack/include/B2BUAConnection.h: In member function
`void B2BUA::B2BUAConnection::AddMergedBranch(const std::string&,
const std::string&)':
/d65/src/opensipstack/include/B2BUAConnection.h:771: error:
`m_MergedBranch' undeclared (first use this function)
/d65/src/opensipstack/include/B2BUAConnection.h:771: error: (Each
undeclared identifier is reported only once for each function it
appears in.)
/d65/src/opensipstack/include/B2BUAConnection.h: In member function
`BOOL B2BUA::B2BUAConnection::IsMergedBranch(const std::string&,
std::string&)':
/d65/src/opensipstack/include/B2BUAConnection.h:777: error: expected
primary-expression before "const"
/d65/src/opensipstack/include/B2BUAConnection.h:777: error: expected
`;' before "const"
/d65/src/opensipstack/include/B2BUAConnection.h:778: error: `it'
undeclared (first use this function)
/d65/src/opensipstack/include/B2BUAConnection.h:778: error:
`m_MergedBranch' undeclared (first use this function)
gmake[1]: *** [obj_solaris_sparc_r/SBCCallHandler.o] Error 1
gmake[1]: Leaving directory `/d65/src/opensbc'
gmake: *** [optnoshared] Error 2
#######################################################