diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon index f28f0e327..de9624745 100644 --- a/configure/os/CONFIG.Common.vxWorksCommon +++ b/configure/os/CONFIG.Common.vxWorksCommon @@ -132,13 +132,6 @@ OPT_CXXFLAGS_YES = -O2 #-------------------------------------------------- # code flags CODE_CFLAGS = -# -# For vxWorks versions before 6.3 we need this g++ compiler flag -CODE_CXXFLAGS_6.0 = -fno-implicit-templates -CODE_CXXFLAGS_6.1 = -fno-implicit-templates -CODE_CXXFLAGS_6.2 = -fno-implicit-templates -CODE_CXXFLAGS_6 = $(CODE_CXXFLAGS_$(VXWORKS_VERSION)) -CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(VXWORKS_MAJOR_VERSION)) #-------------------------------------------------- # no shared libs for vxWorks diff --git a/configure/os/CONFIG_SITE.Common.vxWorksCommon b/configure/os/CONFIG_SITE.Common.vxWorksCommon index 9112669e1..ae9f403c0 100644 --- a/configure/os/CONFIG_SITE.Common.vxWorksCommon +++ b/configure/os/CONFIG_SITE.Common.vxWorksCommon @@ -59,15 +59,6 @@ OP_SYS_INCLUDE_CPPFLAGS_6 += -include $(VX_DIR)/target/h/vxWorks.h OP_SYS_INCLUDE_CPPFLAGS_7 += -include vxWorks.h OP_SYS_INCLUDE_CPPFLAGS = $(OP_SYS_INCLUDE_CPPFLAGS_$(VXWORKS_MAJOR_VERSION)) -# For gcc versions before 3.4 we need this g++ compiler flag -# However WindRiver says gcc 3.3 does not need it any more -# which would allow to build vxWorks 6 without this flag. -# Maybe we can live without it at the penalty of larger code. -# See vxWorks 5 docs/gnu2.96+ppc/gcc.html -# chapter 4.5 "Where's the Template?" -CODE_CXXFLAGS_OLD = -fno-implicit-templates -CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(VX_OLD_GCC)) - # WIND_BASE is where you installed the Wind River software. WIND_BASE = /afs/psi.ch/project/vxworks/VxWorks$(VXWORKS_VERSION) diff --git a/modules/ca/src/client/Makefile b/modules/ca/src/client/Makefile index 2345aad68..a8c0fed06 100644 --- a/modules/ca/src/client/Makefile +++ b/modules/ca/src/client/Makefile @@ -78,7 +78,6 @@ LIBSRCS += comQueSend.cpp LIBSRCS += comBuf.cpp LIBSRCS += hostNameCache.cpp LIBSRCS += msgForMultiplyDefinedPV.cpp -LIBSRCS_vxWorks += templateInstances.cpp API_HEADER = libCaAPI.h ca_API = libCa diff --git a/modules/ca/src/client/templateInstances.cpp b/modules/ca/src/client/templateInstances.cpp deleted file mode 100644 index c7263c5a0..000000000 --- a/modules/ca/src/client/templateInstances.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ - -/* - * - * - * L O S A L A M O S - * Los Alamos National Laboratory - * Los Alamos, New Mexico 87545 - * - * Copyright, 1986, The Regents of the University of California. - * - * - * Author Jeffrey O. Hill - * johill@lanl.gov - * 505 665 1831 - */ - -#include "cac.h" -#include "oldAccess.h" -#include "repeaterClient.h" - -template class chronIntIdResTable < nciu >; -template class chronIntIdResTable < baseNMIU >; -template class chronIntIdResTable < CASG >; -template class resTable < nciu, chronIntId >; -template class resTable < baseNMIU, chronIntId >; -template class resTable < CASG, chronIntId >; -template class resTable < bhe, inetAddrID >; -template class resTable < tcpiiu, caServerID >; -template class tsFreeList < bhe, 0x100 >; -template class tsFreeList < tcpiiu, 32, epicsMutexNOOP >; -template class tsFreeList < netReadNotifyIO, 1024, epicsMutexNOOP >; -template class tsFreeList < netWriteNotifyIO, 1024, epicsMutexNOOP >; -template class tsFreeList < netSubscription, 1024, epicsMutexNOOP >; -template class tsFreeList < CASG, 128, epicsMutexNOOP >; -template class tsFreeList < syncGroupReadNotify, 128, epicsMutexNOOP >; -template class tsFreeList < syncGroupWriteNotify, 128, epicsMutexNOOP >; -template class tsFreeList < comBuf, 0x20 >; -template class tsFreeList < getCallback, 1024, epicsMutexNOOP >; -template class tsFreeList < getCopy, 1024, epicsMutexNOOP >; -template class tsFreeList < msgForMultiplyDefinedPV, 16 >; -template class tsFreeList < nciu, 1024, epicsMutexNOOP>; -template class tsFreeList < oldChannelNotify, 1024, epicsMutexNOOP >; -template class tsFreeList < oldSubscription, 1024, epicsMutexNOOP >; -template class tsFreeList < putCallback, 1024, epicsMutexNOOP >; -template class tsFreeList < repeaterClient, 0x20 >; -template class epicsSingleton < localHostName >; -template unsigned comBuf :: push ( const double * pValue, unsigned nElem ); -template unsigned comBuf :: push ( const float * pValue, unsigned nElem ); -template unsigned comBuf :: push ( const int * pValue, unsigned nElem ); -template unsigned comBuf :: push ( const short * pValue, unsigned nElem ); -template comBuf :: popStatus comBuf :: pop ( unsigned int & returnVal ); -template comBuf :: popStatus comBuf :: pop ( unsigned short & returnVal ); -template comBuf :: popStatus comBuf :: pop ( unsigned char & returnVal ); -template void ca_client_context :: whenThereIsAnExceptionDestroySyncGroupIO - (epicsGuard < epicsMutex > &, syncGroupWriteNotify & ); -template void ca_client_context :: whenThereIsAnExceptionDestroySyncGroupIO - ( epicsGuard < epicsMutex > &, syncGroupReadNotify & ); diff --git a/modules/database/src/ioc/db/Makefile b/modules/database/src/ioc/db/Makefile index 2dbf89192..1ac8f1309 100644 --- a/modules/database/src/ioc/db/Makefile +++ b/modules/database/src/ioc/db/Makefile @@ -100,4 +100,3 @@ dbCore_SRCS += chfPlugin.c dbCore_SRCS += dbState.c dbCore_SRCS += dbUnitTest.c dbCore_SRCS += dbServer.c -dbCore_SRCS_vxWorks += templateInstances.cpp diff --git a/modules/database/src/ioc/db/templateInstances.cpp b/modules/database/src/ioc/db/templateInstances.cpp deleted file mode 100644 index 2027016fd..000000000 --- a/modules/database/src/ioc/db/templateInstances.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "dbCAC.h" -#include "dbChannelIO.h" -#include "dbPutNotifyBlocker.h" - -template class tsFreeList < dbSubscriptionIO, 256, epicsMutexNOOP >; -template class tsFreeList < dbChannelIO, 256, epicsMutexNOOP >; -template class tsFreeList < dbPutNotifyBlocker, 64, epicsMutexNOOP >; -template class resTable < dbBaseIO, chronIntId >; -template class chronIntIdResTable < dbBaseIO >;