epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

workaround for new ( std::no_throw ) Tornado II compiler bug check

Browse Source
This commit is contained in:
Jeff Hill
2001-09-10 14:45:45 +00:00
parent 0afaadb981
commit bf5ffaf41b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ca/cac.cpp
View File

@@ -171,9 +171,10 @@ cac::cac ( cacNotify & notifyIn, bool enablePreemptiveCallbackIn ) :
tmp[0] = '\0';
}
len = strlen ( tmp ) + 1;
this->pUserName = new char [len];
// Tornado II doesnt like new ( std::nothrow )
this->pUserName = new /*( std::nothrow )*/ char [ len ];
if ( ! this->pUserName ) {
throwWithLocation ( caErrorCode (ECA_ALLOCMEM) );
throw std::bad_alloc ();
}
strncpy ( this->pUserName, tmp, len );
}
@@ -234,7 +235,8 @@ cac::cac ( cacNotify & notifyIn, bool enablePreemptiveCallbackIn ) :
}
if ( ! enablePreemptiveCallbackIn ) {
this->pCallbackLocker = new ( std::nothrow ) callbackAutoMutex ( *this );
// Tornado II doesnt like new ( std::nothrow )
this->pCallbackLocker = new /*( std::nothrow )*/ callbackAutoMutex ( *this );
if ( ! this->pCallbackLocker ) {
osiSockRelease ();
delete [] this->pUserName;