Compare commits
4 Commits
master
...
fix_compil
| Author | SHA1 | Date | |
|---|---|---|---|
| 8fa17e0f15 | |||
| ace5da0dfd | |||
| edcbf03505 | |||
| b1f8777606 |
@@ -114,7 +114,11 @@ inline void gdd::setStatSevr(aitInt16 stat, aitInt16 sevr)
|
|||||||
{ status.s.aitStat = stat; status.s.aitSevr = sevr; }
|
{ status.s.aitStat = stat; status.s.aitSevr = sevr; }
|
||||||
|
|
||||||
inline gdd& gdd::operator=(const gdd& v)
|
inline gdd& gdd::operator=(const gdd& v)
|
||||||
|
#if __cplusplus >= 201103L
|
||||||
|
= default;
|
||||||
|
#else
|
||||||
{ memcpy(this,&v,sizeof(gdd)); return *this; }
|
{ memcpy(this,&v,sizeof(gdd)); return *this; }
|
||||||
|
#endif
|
||||||
|
|
||||||
inline int gdd::isScalar(void) const { return dimension()==0?1:0; }
|
inline int gdd::isScalar(void) const { return dimension()==0?1:0; }
|
||||||
inline int gdd::isContainer(void) const
|
inline int gdd::isContainer(void) const
|
||||||
|
|||||||
@@ -307,7 +307,6 @@ void gdd::test()
|
|||||||
pdd->convertAddressToOffsets();
|
pdd->convertAddressToOffsets();
|
||||||
pdd->convertOffsetsToAddress();
|
pdd->convertOffsetsToAddress();
|
||||||
pdd->dump();
|
pdd->dump();
|
||||||
pdd->unreference();
|
|
||||||
delete [] buf;
|
delete [] buf;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@@ -509,7 +508,6 @@ void gddContainer::test(void)
|
|||||||
cdd1->dump();
|
cdd1->dump();
|
||||||
fprintf(stderr,"=====RE-DUMP OF ORIGINAL CONTAINER:\n");
|
fprintf(stderr,"=====RE-DUMP OF ORIGINAL CONTAINER:\n");
|
||||||
dump();
|
dump();
|
||||||
cdd1->unreference();
|
|
||||||
delete [] buf;
|
delete [] buf;
|
||||||
|
|
||||||
// test copy(), Dup(), copyInfo()
|
// test copy(), Dup(), copyInfo()
|
||||||
|
|||||||
@@ -24,7 +24,6 @@
|
|||||||
casCoreClient::casCoreClient ( caServerI & serverInternal ) :
|
casCoreClient::casCoreClient ( caServerI & serverInternal ) :
|
||||||
eventSys ( *this )
|
eventSys ( *this )
|
||||||
{
|
{
|
||||||
assert ( & serverInternal );
|
|
||||||
ctx.setServer ( & serverInternal );
|
ctx.setServer ( & serverInternal );
|
||||||
ctx.setClient ( this );
|
ctx.setClient ( this );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -423,7 +423,7 @@ void casDGIntfIO::sendBeaconIO ( char & msg, unsigned length,
|
|||||||
osiSockAddrNode *pAddr = reinterpret_cast<osiSockAddrNode *>(pNode);
|
osiSockAddrNode *pAddr = reinterpret_cast<osiSockAddrNode *>(pNode);
|
||||||
|
|
||||||
ssize_t status = sendto(this->beaconSock, &msg, length, 0, &pAddr->addr.sa, sizeof(pAddr->addr.ia));
|
ssize_t status = sendto(this->beaconSock, &msg, length, 0, &pAddr->addr.sa, sizeof(pAddr->addr.ia));
|
||||||
if ( status != length ) {
|
if ( status != static_cast<ssize_t>(length) ) {
|
||||||
char sockErrBuf[64], buf[64];
|
char sockErrBuf[64], buf[64];
|
||||||
epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );
|
epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );
|
||||||
ipAddrToA ( &pAddr->addr.ia, buf, sizeof(buf) );
|
ipAddrToA ( &pAddr->addr.ia, buf, sizeof(buf) );
|
||||||
|
|||||||
Reference in New Issue
Block a user