turn of ms already instantiated warning

This commit is contained in:
Jeff Hill
2001-10-22 03:18:52 +00:00
parent ed88bdd35b
commit 7b1b2988d7
32 changed files with 291 additions and 11 deletions

View File

@@ -35,11 +35,20 @@
#include "autoPtrDestroy.h"
#include "cac.h"
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsSLNode < CASG>;
template class tsFreeList < CASG, 128, 0 >;
template class tsFreeList < syncGroupWriteNotify, 128, 0 >;
template class tsFreeList < syncGroupReadNotify, 128, 0 >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
tsFreeList < struct CASG, 128 > CASG::freeList;
epicsMutex CASG::freeListMutex;

View File

@@ -19,8 +19,17 @@
#include "bhe.h"
#undef epicsExportSharedSymbols
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsFreeList < class bhe, 1024 >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
tsFreeList < class bhe, 1024 > bhe::freeList;
epicsMutex bhe::freeListMutex;

View File

@@ -27,6 +27,7 @@
#include "tsDLList.h"
#include "tsFreeList.h"
#include "epicsTime.h"
#include "epicsMutex.h"
#ifdef bhehEpicsExportSharedSymbols
# define epicsExportSharedSymbols
@@ -40,7 +41,7 @@ class bhe : public tsSLNode < bhe >, public inetAddrID {
public:
epicsShareFunc bhe ( const epicsTime &initialTimeStamp, const inetAddrID &addr );
epicsShareFunc void destroy ();
epicsShareFunc bool updatePeriod ( const epicsTime & programBeginTime,
epicsShareFunc bool updatePeriod ( const epicsTime & programBeginTime,
const epicsTime & currentTime );
epicsShareFunc double period () const;
epicsShareFunc void show ( unsigned level) const;

View File

@@ -36,6 +36,11 @@
#include "net_convert.h"
#undef epicsExportSharedSymbols
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class resTable < nciu, chronIntId >;
template class chronIntIdResTable < nciu >;
template class tsSLNode < tcpiiu >;
@@ -50,6 +55,10 @@ template class tsFreeList < netReadNotifyIO, 1024, 0 >;
template class tsFreeList < netWriteNotifyIO, 1024, 0 >;
template class tsFreeList < netSubscription, 1024, 0 >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
// TCP response dispatch table
const cac::pProtoStubTCP cac::tcpJumpTableCAC [] =
{

View File

@@ -19,8 +19,17 @@
#include "iocinf.h"
#include "comBuf.h"
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsFreeList < class comBuf, 0x20 >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
tsFreeList < class comBuf, 0x20 > comBuf::freeList;
epicsMutex comBuf::freeListMutex;

View File

@@ -18,8 +18,17 @@
#include "iocinf.h"
#include "oldAccess.h"
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsFreeList < class getCallback, 1024 >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
tsFreeList < class getCallback, 1024 > getCallback::freeList;
epicsMutex getCallback::freeListMutex;

View File

@@ -21,8 +21,17 @@
#include "oldAccess.h"
#include "cac.h"
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsFreeList < class getCopy, 1024 >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
tsFreeList < class getCopy, 1024 > getCopy::freeList;
epicsMutex getCopy::freeListMutex;

View File

@@ -21,8 +21,17 @@
#include "iocinf.h"
#include "hostNameCache.h"
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsFreeList < hostNameCache, 16 >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
tsFreeList < hostNameCache, 16 > hostNameCache::freeList;
epicsMutex hostNameCache::freeListMutex;

View File

@@ -25,8 +25,17 @@
#include "caerr.h" // for ECA_DBLCHNL
#undef epicsExportSharedSymbols
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsFreeList < class msgForMultiplyDefinedPV, 16 >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
tsFreeList < class msgForMultiplyDefinedPV, 16 >
msgForMultiplyDefinedPV::freeList;
epicsMutex msgForMultiplyDefinedPV::freeListMutex;

View File

@@ -32,9 +32,18 @@
#include "db_access.h" // for INVALID_DB_REQ
#undef epicsExportSharedSymbols
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsFreeList < nciu, 1024, 0 >;
template class tsSLNode < baseNMIU >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
tsFreeList < class nciu, 1024 > nciu::freeList;
epicsMutex nciu::freeListMutex;

View File

@@ -145,15 +145,6 @@ inline class nciu & baseNMIU::channel () const
return this->chan;
}
inline netSubscription * netSubscription::factory (
tsFreeList < class netSubscription, 1024 > &freeList,
nciu &chan, unsigned type, arrayElementCount count,
unsigned mask, cacStateNotify &notify )
{
return new ( freeList ) netSubscription ( chan, type,
count, mask, notify );
}
inline void * netSubscription::operator new ( size_t size,
tsFreeList < class netSubscription, 1024 > &freeList )
{
@@ -171,8 +162,18 @@ inline void netSubscription::operator delete ( void *pCadaver, size_t size,
{
freeList.release ( pCadaver, size );
}
#error
#endif
inline netSubscription * netSubscription::factory (
tsFreeList < class netSubscription, 1024 > &freeList,
nciu &chan, unsigned type, arrayElementCount count,
unsigned mask, cacStateNotify &notify )
{
return new ( freeList ) netSubscription ( chan, type,
count, mask, notify );
}
inline arrayElementCount netSubscription::getCount () const
{
arrayElementCount nativeCount = this->chan.nativeElementCount ();

View File

@@ -19,8 +19,17 @@
#include "cac.h"
#include "netiiu.h"
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsSLNode < nciu >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
netiiu::netiiu ( cac *pClientCtxIn ) : pClientCtx ( pClientCtxIn )
{
}

View File

@@ -21,8 +21,17 @@
#include "oldAccess.h"
#include "cac.h"
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsFreeList < struct oldChannelNotify, 1024 >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
tsFreeList < struct oldChannelNotify, 1024 > oldChannelNotify::freeList;
epicsMutex oldChannelNotify::freeListMutex;

View File

@@ -13,8 +13,17 @@
#include "iocinf.h"
#include "oldAccess.h"
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsFreeList < struct oldSubscription, 1024 >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
tsFreeList < struct oldSubscription, 1024 > oldSubscription::freeList;
epicsMutex oldSubscription::freeListMutex;

View File

@@ -18,8 +18,17 @@
#include "iocinf.h"
#include "oldAccess.h"
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsFreeList < class putCallback, 1024 >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
tsFreeList < class putCallback, 1024 > putCallback::freeList;
epicsMutex putCallback::freeListMutex;

View File

@@ -99,7 +99,18 @@ private:
* per machine so we dont care about reentrancy
*/
static tsDLList < repeaterClient > client_list;
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsFreeList < repeaterClient, 0x20 >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
tsFreeList < repeaterClient, 0x20 > repeaterClient::freeList;
epicsMutex repeaterClient::freeListMutex;

View File

@@ -6,9 +6,18 @@
#include "directoryServer.h"
#include "tsMinMax.h"
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsSLNode<pvEntry>;
template class resTable<pvEntry, stringId>;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
const pvInfo *pvInfo::pFirst;
//

View File

@@ -4,10 +4,19 @@
#include "exServer.h"
#include "gddApps.h"
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class gddAppFuncTable < exPV >;
template class tsSLNode < pvEntry >;
template class resTable < pvEntry, stringId >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
//
// static data for exPV
//

View File

@@ -8,8 +8,17 @@
//
#include "exServer.h"
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsSLNode < exPV >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
//
// static list of pre-created PVs
//

View File

@@ -37,12 +37,21 @@
#include "server.h"
#include "casCtxIL.h" // casCtx in line func
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsSLNode < casPVI >;
template class tsSLNode < casRes >;
template class resTable < casRes, chronIntId >;
template class resTable < casEventMaskEntry, stringId >;
template class chronIntIdResTable < casRes >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
//
// the maximum beacon period if EPICS_CA_BEACON_PERIOD isnt available
//

View File

@@ -34,9 +34,18 @@
#include "server.h"
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsSLNode < casEventMaskEntry >;
template class resTable < casEventMaskEntry, stringId >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
#ifdef TEST
main ()
{

View File

@@ -29,8 +29,17 @@
#include "dbChannelIOIL.h"
#include "dbNotifyBlockerIL.h"
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsFreeList < dbChannelIO >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
tsFreeList < dbChannelIO > dbChannelIO::freeList;
epicsMutex dbChannelIO::freeListMutex;
unsigned dbChannelIO::nextIdForIO;

View File

@@ -37,8 +37,17 @@
#define S_db_Blocked (M_dbAccess|39)
#define S_db_Pending (M_dbAccess|37)
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsFreeList < dbPutNotifyBlocker, 1024, 0 >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
tsFreeList < dbPutNotifyBlocker, 1024, 0 > dbPutNotifyBlocker::freeList;
epicsMutex dbPutNotifyBlocker::freeListMutex;

View File

@@ -33,10 +33,19 @@
#include "dbChannelIOIL.h"
#include "dbNotifyBlockerIL.h"
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class chronIntIdResTable < dbBaseIO >;
template class tsSLNode < dbBaseIO >;
template class resTable < dbBaseIO, chronIntId >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
class dbServiceIOLoadTimeInit {
public:
dbServiceIOLoadTimeInit ();

View File

@@ -30,7 +30,17 @@
#include "dbChannelIOIL.h"
#include "db_access_routines.h"
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsFreeList < dbSubscriptionIO >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
tsFreeList < dbSubscriptionIO > dbSubscriptionIO::freeList;
epicsMutex dbSubscriptionIO::freeListMutex;

View File

@@ -592,6 +592,27 @@ resTable<T,ID>::~resTable()
operator delete ( this->pTable );
}
//
// resTable<T,ID>::resTable ( const resTable & )
// private - not to be used - implemented to shush
// MS warnings
//
template <class T, class ID>
inline resTable<T,ID>::resTable ( const resTable & )
{
}
//
// resTable<T,ID>::resTable & operator = ( const resTable & )
// private - not to be used - implemented to shush
// MS warnings
//
template <class T, class ID>
inline resTable<T,ID> & resTable<T,ID>::operator = ( const resTable & )
{
return *this;
}
//////////////////////////////////////////////
// resTableIter<T,ID> member functions
//////////////////////////////////////////////

View File

@@ -58,7 +58,9 @@
// these versions of the microsoft compiler incorrectly
// warn about a missing delete operator if only the
// preferred delete operator with a size argument is present
// newly preferred delete operator with a size argument
// is present - I expect that they will fix this in the
// next version
#if defined ( _MSC_VER ) && _MSC_VER <= 1200
# pragma warning ( disable : 4291 )
#endif

View File

@@ -53,10 +53,19 @@
#include "fdManager.h"
#include "locationException.h"
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsSLNode < fdReg >;
template class intId < unsigned int, 8, 32 >;
template class resTable < fdReg, fdRegId >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
epicsShareDef fdManager fileDescriptorManager;
//

View File

@@ -97,10 +97,19 @@ private:
chronIntIdResTable <timerForOldFdmgr> resTbl;
};
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class resTable < timerForOldFdmgr, chronIntId >;
template class tsSLNode < timerForOldFdmgr >;
template class chronIntIdResTable < timerForOldFdmgr >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
epicsShareFunc fdRegForOldFdmgr::fdRegForOldFdmgr
(const SOCKET fdIn, const fdRegType typeIn,
const bool onceOnlyIn, fdManager &managerIn,

View File

@@ -348,10 +348,19 @@ void testPeriodic ()
queue.release ();
}
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsFreeList < delayVerify, 32, 0 >;
template class tsFreeList < cancelVerify, 32, 0 >;
template class tsFreeList < periodicVerify, 32, 0 >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
void epicsTimerTest ()
{
testAccuracy ();

View File

@@ -32,10 +32,19 @@
#include "epicsTimer.h"
#include "timerPrivate.h"
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsFreeList < epicsTimerForC, 32, 0 >;
template class tsFreeList < epicsTimerQueueActiveForC, 1024, 0 >;
template class tsFreeList < epicsTimerQueuePassiveForC, 1024, 0 >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
struct epicsTimerQueuePassiveForC : public epicsTimerQueueNotify, public timerQueuePassive {
public:
epicsTimerQueuePassiveForC ( epicsTimerQueueRescheduleCallback pCallback, void *pPrivate );

View File

@@ -32,8 +32,17 @@
#define epicsExportSharedSymbols
#include "timerPrivate.h"
#if defined ( _MSC_VER )
# pragma warning ( push )
# pragma warning ( disable: 4660 )
#endif
template class tsFreeList < timer, 32, 0 >;
#if defined ( _MSC_VER )
# pragma warning ( pop )
#endif
timer::timer ( timerQueue &queueIn ) :
curState ( stateLimbo ), pNotify ( 0 ), queue ( queueIn )
{