diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index 83ec381bb..e5c357d1a 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -209,7 +209,7 @@ ifeq ($(HDEPENDS),YES) @$(HDEPENDS_TARGETS_CMD) $*$(DEP) endif @$(RM) $@ - $(COMPILE.cpp) $< + $(COMPILE.cpp) $< $(COMPILE_FILTER.cpp) %$(OBJ): %.cpp ifeq ($(HDEPENDS),YES) @@ -218,7 +218,7 @@ ifeq ($(HDEPENDS),YES) @$(HDEPENDS_TARGETS_CMD) $*$(DEP) endif @$(RM) $@ - $(COMPILE.cpp) $< + $(COMPILE.cpp) $< $(COMPILE_FILTER.cpp) %$(OBJ): %.C ifeq ($(HDEPENDS),YES) @@ -227,7 +227,7 @@ ifeq ($(HDEPENDS),YES) @$(HDEPENDS_TARGETS_CMD) $*$(DEP) endif @$(RM) $@ - $(COMPILE.cpp) $< + $(COMPILE.cpp) $< $(COMPILE_FILTER.cpp) # WIN95/NT resource compiler %$(RES): %.rc diff --git a/configure/os/CONFIG.Common.hpux-parisc b/configure/os/CONFIG.Common.hpux-parisc index 0d6d8c26e..f8c43c568 100644 --- a/configure/os/CONFIG.Common.hpux-parisc +++ b/configure/os/CONFIG.Common.hpux-parisc @@ -1,10 +1,10 @@ -# CONFIG.Common.hpux-68k +# CONFIG.Common.hpux-parisc # # $Id$ # This file is maintained by the build community. # -# Definitions for hpux-68k target archs -# Sites may override these definitions in CONFIG_SITE.Common.hpux-68k +# Definitions for hpux-parisc target archs +# Sites may override these definitions in CONFIG_SITE.Common.hpux-parisc #------------------------------------------------------- #Include definitions common to unix targets @@ -21,7 +21,7 @@ POSIX_LDLIBS_NO += OP_SYS_CPPFLAGS = -D_HPUX_SOURCE -DHP_UX OP_SYS_CFLAGS = +z OP_SYS_CXXFLAGS = +z -OP_SYS_LDLIBS += +OP_SYS_LDLIBS += -lpthread SHRLIB_SUFFIX = .sl diff --git a/configure/os/CONFIG.hpux-parisc.Common b/configure/os/CONFIG.hpux-parisc.Common index 851c62e2a..111b879ac 100644 --- a/configure/os/CONFIG.hpux-parisc.Common +++ b/configure/os/CONFIG.hpux-parisc.Common @@ -10,5 +10,5 @@ #Include definitions common to unix hosts include $(CONFIG)/os/CONFIG.UnixCommon.Common -WIND_HOST_TYPE = parisc-hpux +WIND_HOST_TYPE = parisc-hpux10 diff --git a/configure/os/CONFIG.hpux-parisc.hpux-parisc b/configure/os/CONFIG.hpux-parisc.hpux-parisc index 76c8643a8..28d9d83be 100644 --- a/configure/os/CONFIG.hpux-parisc.hpux-parisc +++ b/configure/os/CONFIG.hpux-parisc.hpux-parisc @@ -27,30 +27,33 @@ WARN_CFLAGS_NO = -w OPT_CFLAGS_YES = -O OPT_CFLAGS_NO = -g -# HP's aCC will not compile things if run in STRICT mode -CXXCMPLR=NORMAL +CXXCMPLR=STRICT + +COMPILE_FILTER.cpp = 2>&1 | $(TOP)/configure/tools/filterWarnings.pl # Configure OS vendor C++ compiler -CONFORM_CXXFLAGS_NORMAL = +W302 +W829 +W818 +W392 +W469 +W495 +W749 +W667 +W392 +W684 -CONFORM_CXXFLAGS_STRICT = +p +CONFORM_CXXFLAGS_NORMAL = -AA -mt -Aa +#CONFORM_CXXFLAGS_STRICT = +p +CONFORM_CXXFLAGS_STRICT = -AA -mt -Aa + ###################################################### # +DAportable causes portable object code to be created for execution # on different PA-Risc machines CODE_CXXFLAGS = +DAportable WARN_CXXFLAGS_YES = +w WARN_CXXFLAGS_NO = -OPT_CXXFLAGS_YES = -O +OPT_CXXFLAGS_YES = +O3 OPT_CXXFLAGS_NO = -g -STATIC_LDFLAGS_YES= -Wl,-a,archive +A +STATIC_LDFLAGS_YES= -Wl,-a,archive -l:libc.sl +A # shared libs will be found by searching environment variable SHLIB_PATH, # then by searching the specified path (see below) STATIC_LDFLAGS_YES+= -b STATIC_LDFLAGS_NO = -Wl,+b$(DEFAULT_SHRLIB_SEARCH_PATH),+s STATIC_LDLIBS_YES= STATIC_LDLIBS_NO= +TARGET_LDFLAGS += -AA -mt SHRLIB_LDFLAGS_YES = -G -h $@ HDEPENDS_FLAGS_CMPLR = +m - diff --git a/configure/tools/filterWarnings.pl b/configure/tools/filterWarnings.pl new file mode 100755 index 000000000..c2d9961e2 --- /dev/null +++ b/configure/tools/filterWarnings.pl @@ -0,0 +1,34 @@ +eval 'exec perl -S $0 ${1+"$@"}' # -*- Mode: perl -*- + if $running_under_some_shell; # makeDependsTargets.pl + +# $Id$ +# +# Author: Ralph Lange +# + +use Text::Wrap; + +my ($errline, $errno, $codeline, $pointline); + +$Text::Wrap::columns = $ENV{COLUMNS} if $ENV{COLUMNS}; + +sub Usage +{ + print "Usage:\n"; + print " 2>&1 | $0\n"; + + exit 2; +} + +while ( $errline = <> ) { + if ( $errline =~ m/^(Warning|Error)/ ) { + ($errno) = ($errline =~ m/.* ([0-9]+):/); + $codeline = <>; + $pointline = <>; + next if $codeline =~ m|//\s*X.*aCC[^a-zA-Z]*$errno|; + + print wrap ("", " ", $errline); + print $codeline; + print $pointline; + } +} diff --git a/src/db/dbCAC.h b/src/db/dbCAC.h index 595630327..7a7a4def2 100644 --- a/src/db/dbCAC.h +++ b/src/db/dbCAC.h @@ -1,15 +1,14 @@ - -/* +/* * $Id$ * - * + * * 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 @@ -34,7 +33,8 @@ class dbChannelIO; class dbPutNotifyBlocker; class dbSubscriptionIO; -class dbBaseIO : public chronIntIdRes < dbBaseIO > { +class dbBaseIO // X aCC 655 + : public chronIntIdRes < dbBaseIO > { public: virtual dbSubscriptionIO * isSubscription () = 0; virtual void destroy () = 0; diff --git a/src/db/dbServiceIO.cpp b/src/db/dbServiceIO.cpp index d24fd7c65..968c429ec 100644 --- a/src/db/dbServiceIO.cpp +++ b/src/db/dbServiceIO.cpp @@ -1,4 +1,3 @@ - /* * $Id$ * @@ -80,7 +79,7 @@ dbServiceIO::~dbServiceIO () } } -cacChannel *dbServiceIO::createChannel ( +cacChannel *dbServiceIO::createChannel ( // X aCC 361 const char *pName, cacChannelNotify ¬ify, cacChannel::priLev ) { @@ -90,12 +89,12 @@ cacChannel *dbServiceIO::createChannel ( if ( status ) { return 0; } - else if ( ! ca_preemtive_callback_is_enabled () ) { - errlogPrintf ( - "dbServiceIO: preemptive callback required for direct in\n" - "memory interfacing of CA channels to the DB.\n" ); - return 0; - } + else if ( ! ca_preemtive_callback_is_enabled () ) { + errlogPrintf ( + "dbServiceIO: preemptive callback required for direct in\n" + "memory interfacing of CA channels to the DB.\n" ); + return 0; + } else { return new dbChannelIO ( notify, addr, *this ); }