Commit 597c4a2c authored by Luciano Orsini's avatar Luciano Orsini
Browse files

references #4662: ++ (GCC) 7.2.1 20170829 (Red Hat 7.2.1-1) pre-pass


git-svn-id: file:///tmp/cmsos_migration/cmsos.svndb/trunk@31695 c528359e-2999-456a-ae53-7ba8edf254b3
parent a61697dc
......@@ -41,7 +41,7 @@ namespace fedemulator
const std::string summary = "Emulates a FED with a GIII card.";
const std::string link = "";
config::PackageInfo getPackageInfo();
void checkPackageDependencies() throw (config::PackageInfo::VersionException);
void checkPackageDependencies() ;
std::set<std::string, std::less<std::string> > getPackageDependencies();
}
......
......@@ -5,7 +5,7 @@
XDAQ_INSTANTIATOR_IMPL(d2s::FEDEmulator);
d2s::FEDEmulator::FEDEmulator(xdaq::ApplicationStub* stub)
throw (xdaq::exception::Exception):
:
xdaq::WebApplication(stub),
logger_(getApplicationLogger()),
thresholdTTSReady_(0x40),
......@@ -227,7 +227,7 @@ d2s::FEDEmulator::~FEDEmulator() {
xoap::MessageReference d2s::FEDEmulator::changeState (xoap::MessageReference msg)
throw (xoap::exception::Exception) {
{
xoap::SOAPPart part = msg->getSOAPPart();
xoap::SOAPEnvelope env = part.getEnvelope();
......@@ -275,14 +275,14 @@ xoap::MessageReference d2s::FEDEmulator::changeState (xoap::MessageReference msg
void d2s::FEDEmulator::stateChanged (toolbox::fsm::FiniteStateMachine & fsm)
throw (toolbox::fsm::exception::Exception) {
{
LOG4CPLUS_DEBUG (getApplicationLogger(), "New state is:" <<
fsm.getStateName (fsm.getCurrentState()) );
}
void d2s::FEDEmulator::failedTransition (toolbox::Event::Reference e)
throw (toolbox::fsm::exception::Exception) {
{
toolbox::fsm::FailedEvent & fe = dynamic_cast<toolbox::fsm::FailedEvent&>(*e);
LOG4CPLUS_ERROR(getApplicationLogger(),
......@@ -374,7 +374,7 @@ void d2s::FEDEmulator::webTableEntry( xgi::Output *out, const std::string name,
}
void d2s::FEDEmulator::defaultWebPage(xgi::Input *in, xgi::Output *out)
throw (xgi::exception::Exception) {
{
FEDEmulator::Get_Counters();
......@@ -441,7 +441,7 @@ void d2s::FEDEmulator::defaultWebPage(xgi::Input *in, xgi::Output *out)
void d2s::FEDEmulator::setParameter(xgi::Input * in, xgi::Output * out )
throw (xgi::exception::Exception) {
{
// ignore when not in appropriate state
if (! (fsm_.getStateName( fsm_.getCurrentState()) == "Enabled"))
......@@ -1365,7 +1365,7 @@ void d2s::FEDEmulator::Get_Counters()
xoap::MessageReference d2s::FEDEmulator::createFsmSoapResponseMsg( const std::string event,const std::string state )
throw (xcept::Exception) {
{
try
{
......
......@@ -20,7 +20,7 @@
GETPACKAGEINFO(fedemulator)
void fedemulator::checkPackageDependencies() throw (config::PackageInfo::VersionException)
void fedemulator::checkPackageDependencies()
{
CHECKDEPENDENCY(config);
CHECKDEPENDENCY(xcept);
......
......@@ -43,7 +43,7 @@ namespace d2sfirmwareloader
const std::string summary = "d2sfirmwareloader";
const std::string link = "http://xdaqwiki.cern.ch/index.php";
config::PackageInfo getPackageInfo();
void checkPackageDependencies() throw (config::PackageInfo::VersionException);
void checkPackageDependencies() ;
std::set<std::string, std::less<std::string> > getPackageDependencies();
}
......
......@@ -23,7 +23,7 @@
GETPACKAGEINFO(d2sfirmwareloader)
void d2sfirmwareloader::checkPackageDependencies() throw (config::PackageInfo::VersionException)
void d2sfirmwareloader::checkPackageDependencies()
{
CHECKDEPENDENCY(ttsipcutils);
......
......@@ -43,7 +43,7 @@ namespace d2sgtpe
const std::string summary = "d2sgtpe";
const std::string link = "http://xdaqwiki.cern.ch/index.php";
config::PackageInfo getPackageInfo();
void checkPackageDependencies() throw (config::PackageInfo::VersionException);
void checkPackageDependencies() ;
std::set<std::string, std::less<std::string> > getPackageDependencies();
}
......
......@@ -56,7 +56,7 @@ d2s::GTPeCard::~GTPeCard() {
std::string d2s::GTPeCard::readFirmwareRevisison()
throw (HAL::HardwareAccessException) {
{
uint32_t year;
uint32_t month;
......@@ -91,28 +91,28 @@ std::string d2s::GTPeCard::BCDtoString(uint32_t num, uint32_t ndigit) {
void d2s::GTPeCard::globalReset()
throw (HAL::HardwareAccessException) {
{
_gtpe->write("GlobalReset", 0x1);
_gtpe->write("GlobalReset", 0x0);
};
void d2s::GTPeCard::resetCounters()
throw (HAL::HardwareAccessException) {
{
_gtpe->write("ResetGTPCounters", 0x1 );
_gtpe->write("ResetGTPCounters", 0x0 );
};
void d2s::GTPeCard::setClockPeriod(uint32_t n_25ns)
throw (HAL::HardwareAccessException) {
{
_gtpe->write("TriggerClockPeriod", n_25ns);
}
uint32_t d2s::GTPeCard::readbackClockPeriod()
throw (HAL::HardwareAccessException) {
{
uint32_t n_25ns;
......@@ -122,13 +122,13 @@ uint32_t d2s::GTPeCard::readbackClockPeriod()
}
void d2s::GTPeCard::toggleSLINKRequired(bool requ)
throw (HAL::HardwareAccessException) {
{
_gtpe->write("ignoreSLINK", requ ? 0x0 : 0x1);
};
bool d2s::GTPeCard::isSLINKRequired()
throw (HAL::HardwareAccessException) {
{
uint32_t val;
_gtpe->read("ignoreSLINK", &val);
......@@ -138,27 +138,27 @@ bool d2s::GTPeCard::isSLINKRequired()
void d2s::GTPeCard::startSLINK()
throw (HAL::HardwareAccessException) {
{
_gtpe->write("startSLINK", 0x1);
};
void d2s::GTPeCard::stopSLINK()
throw (HAL::HardwareAccessException) {
{
_gtpe->write("startSLINK", 0x0);
};
void d2s::GTPeCard::toggleClockedMode(bool clocked)
throw (HAL::HardwareAccessException) {
{
_gtpe->write("ClockedMode", clocked ? 0x1 : 0x0);
}
bool d2s::GTPeCard::isClockedMode()
throw (HAL::HardwareAccessException) {
{
uint32_t val;
_gtpe->read("ClockedMode", &val);
......@@ -168,7 +168,7 @@ bool d2s::GTPeCard::isClockedMode()
void d2s::GTPeCard::enableBCResetLEMO(bool enable)
throw (HAL::HardwareAccessException) {
{
_gtpe->write("BCResetLEMOEnable", enable ? 0x1 : 0x0);
......@@ -176,7 +176,7 @@ void d2s::GTPeCard::enableBCResetLEMO(bool enable)
void d2s::GTPeCard::enableBunchStructureLEMO(bool enable)
throw (HAL::HardwareAccessException) {
{
_gtpe->write("BunchStrucLEMOEnable", enable ? 0x1 : 0x0);
......@@ -184,7 +184,7 @@ void d2s::GTPeCard::enableBunchStructureLEMO(bool enable)
bool d2s::GTPeCard::isBCResetLEMOEnabled()
throw (HAL::HardwareAccessException) {
{
uint32_t val;
_gtpe->read("BCResetLEMOEnable", &val);
......@@ -194,7 +194,7 @@ bool d2s::GTPeCard::isBCResetLEMOEnabled()
bool d2s::GTPeCard::isBunchStructureLEMOEnabled()
throw (HAL::HardwareAccessException) {
{
uint32_t val;
_gtpe->read("BunchStrucLEMOEnable", &val);
......@@ -205,34 +205,34 @@ bool d2s::GTPeCard::isBunchStructureLEMOEnabled()
void d2s::GTPeCard::startTriggers()
throw (HAL::HardwareAccessException) {
{
_gtpe->write("GTPePause", 0x0);
_gtpe->write("GTPeStart", 0x1);
};
void d2s::GTPeCard::pauseTriggers()
throw (HAL::HardwareAccessException) {
{
_gtpe->write("GTPePause", 0x1);
}
void d2s::GTPeCard::resumeTriggers()
throw (HAL::HardwareAccessException) {
{
_gtpe->write("GTPePause", 0x0);
}
void d2s::GTPeCard::stopTriggers()
throw (HAL::HardwareAccessException) {
{
_gtpe->write("GTPeStart", 0x0);
_gtpe->write("GTPePause", 0x0);
};
bool d2s::GTPeCard::isRunning()
throw (HAL::HardwareAccessException) {
{
uint32_t val;
_gtpe->read("GTPeStart", &val);
......@@ -242,7 +242,7 @@ bool d2s::GTPeCard::isRunning()
bool d2s::GTPeCard::isPaused()
throw (HAL::HardwareAccessException) {
{
uint32_t val;
_gtpe->read("GTPePause", &val);
......@@ -254,7 +254,7 @@ bool d2s::GTPeCard::isPaused()
double d2s::GTPeCard::setPartitionDef(uint32_t part_group_idx,
uint32_t selected_partitions,
double triggerrate)
throw (HAL::HardwareAccessException, d2s::exception::OutOfRange) {
{
if (part_group_idx>7)
XCEPT_RAISE( d2s::exception::OutOfRange, "partition group index out of range");
......@@ -278,7 +278,7 @@ double d2s::GTPeCard::setPartitionDef(uint32_t part_group_idx,
double d2s::GTPeCard::setPartitionDef(uint32_t part_group_idx,
uint32_t selected_partitions,
uint32_t rate_bits)
throw (HAL::HardwareAccessException, d2s::exception::OutOfRange) {
{
if (part_group_idx>7)
XCEPT_RAISE( d2s::exception::OutOfRange, "partition group index out of range");
......@@ -299,7 +299,7 @@ double d2s::GTPeCard::setPartitionDef(uint32_t part_group_idx,
};
uint32_t d2s::GTPeCard::readbackPartitionDef(uint32_t part_group_idx)
throw (HAL::HardwareAccessException, d2s::exception::OutOfRange) {
{
if (part_group_idx>7)
XCEPT_RAISE( d2s::exception::OutOfRange, "partition group index out of range");
......@@ -315,13 +315,13 @@ uint32_t d2s::GTPeCard::readbackPartitionDef(uint32_t part_group_idx)
uint32_t d2s::GTPeCard::readbackRate(uint32_t part_group_idx)
throw (HAL::HardwareAccessException, d2s::exception::OutOfRange) {
{
return readbackPartitionDef(part_group_idx) & 0xffff;
}
double d2s::GTPeCard::readbackRateHz(uint32_t part_group_idx)
throw (HAL::HardwareAccessException, d2s::exception::OutOfRange) {
{
uint32_t rate = readbackRate(part_group_idx);
......@@ -330,14 +330,14 @@ double d2s::GTPeCard::readbackRateHz(uint32_t part_group_idx)
uint32_t d2s::GTPeCard::readbackSelectedPartitions(uint32_t part_group_idx)
throw (HAL::HardwareAccessException, d2s::exception::OutOfRange) {
{
return ( readbackPartitionDef(part_group_idx) & (0xff << 16) ) >> 16;
}
double d2s::GTPeCard::readbackCurrentTotalRate()
throw (HAL::HardwareAccessException) {
{
if ( isClockedMode() ) {
......@@ -364,14 +364,14 @@ double d2s::GTPeCard::readbackCurrentTotalRate()
void d2s::GTPeCard::latchCounters()
throw (HAL::HardwareAccessException) {
{
_gtpe->writePulse("latchCounters");
}
uint32_t d2s::GTPeCard::readPartitionStatus()
throw (HAL::HardwareAccessException) {
{
uint32_t countval;
_gtpe->read("PARTSTAT", &countval);
......@@ -381,7 +381,7 @@ uint32_t d2s::GTPeCard::readPartitionStatus()
uint64_t d2s::GTPeCard::readCounter64bit(std::string item)
throw (HAL::HardwareAccessException) {
{
uint32_t lowval;
uint32_t highval;
......@@ -393,22 +393,22 @@ uint64_t d2s::GTPeCard::readCounter64bit(std::string item)
}
uint64_t d2s::GTPeCard::readGlobalTimer()
throw (HAL::HardwareAccessException) {
{
return readCounter64bit("GlobalTimer");
}
uint64_t d2s::GTPeCard::readCounterAcceptedTriggers()
throw (HAL::HardwareAccessException) {
{
return readCounter64bit("AcceptedTriggers");
}
uint64_t d2s::GTPeCard::readCounterGeneratedTriggers()
throw (HAL::HardwareAccessException) {
{
return readCounter64bit("GeneratedTriggers");
}
uint64_t d2s::GTPeCard::readCounterPartitionAcceptedTriggers(uint32_t part_idx)
throw (HAL::HardwareAccessException, d2s::exception::OutOfRange) {
{
if (part_idx>7)
XCEPT_RAISE( d2s::exception::OutOfRange, "partition group index out of range");
......@@ -419,7 +419,7 @@ uint64_t d2s::GTPeCard::readCounterPartitionAcceptedTriggers(uint32_t part_idx)
}
uint64_t d2s::GTPeCard::readLostEventsATTS(uint32_t part_idx)
throw (HAL::HardwareAccessException, d2s::exception::OutOfRange) {
{
if (part_idx>7)
XCEPT_RAISE( d2s::exception::OutOfRange, "partition group index out of range");
......@@ -430,7 +430,7 @@ uint64_t d2s::GTPeCard::readLostEventsATTS(uint32_t part_idx)
}
uint64_t d2s::GTPeCard::readLostEventsSTTS(uint32_t det_idx)
throw (HAL::HardwareAccessException, d2s::exception::OutOfRange) {
{
if (det_idx>7)
XCEPT_RAISE( d2s::exception::OutOfRange, "detector partition index out of range");
......@@ -441,7 +441,7 @@ uint64_t d2s::GTPeCard::readLostEventsSTTS(uint32_t det_idx)
}
std::string d2s::GTPeCard::getTriggerRuleName(uint32_t det_idx)
throw (d2s::exception::OutOfRange) {
{
if (det_idx>7)
XCEPT_RAISE( d2s::exception::OutOfRange, "detector partition index out of range");
......@@ -450,7 +450,7 @@ std::string d2s::GTPeCard::getTriggerRuleName(uint32_t det_idx)
}
uint64_t d2s::GTPeCard::readLostEventsTriggerRule(uint32_t det_idx)
throw (HAL::HardwareAccessException, d2s::exception::OutOfRange) {
{
if ( trigger_rule_regnames[det_idx] == NULL )
return 0;
......@@ -462,17 +462,17 @@ uint64_t d2s::GTPeCard::readLostEventsTriggerRule(uint32_t det_idx)
uint64_t d2s::GTPeCard::readLostEventsSLINK()
throw (HAL::HardwareAccessException) {
{
return readCounter64bit("EVMLost");
}
uint64_t d2s::GTPeCard::readLostEventsIntBuf()
throw (HAL::HardwareAccessException) {
{
return readCounter64bit("BUFLost");
}
d2s::GTPeStatus d2s::GTPeCard::readStatusSnapshot()
throw (HAL::HardwareAccessException) {
{
_latch_semaphore.take();
latchCounters();
......@@ -489,7 +489,7 @@ d2s::GTPeStatus d2s::GTPeCard::readStatusSnapshot()
void d2s::GTPeCard::forceATTSOutput (uint32_t part_group_idx,
bool force,
tts::TTSState const& state)
throw (HAL::HardwareAccessException, d2s::exception::OutOfRange) {
{
if (part_group_idx>7)
XCEPT_RAISE( d2s::exception::OutOfRange, "partition group index out of range");
......@@ -534,7 +534,7 @@ void d2s::GTPeCard::forceATTSOutput (uint32_t part_group_idx,
};
tts::TTSState d2s::GTPeCard::readbackATTSTestOutputState(uint32_t part_group_idx)
throw (HAL::HardwareAccessException, d2s::exception::OutOfRange) {
{
if (part_group_idx>7)
XCEPT_RAISE( d2s::exception::OutOfRange, "partition group index out of range");
......@@ -554,7 +554,7 @@ tts::TTSState d2s::GTPeCard::readbackATTSTestOutputState(uint32_t part_group_idx
}
uint32_t d2s::GTPeCard::readbackATTSOutputEnables()
throw (HAL::HardwareAccessException) {
{
uint32_t atts_enable;
_gtpe->read("aTTS_Backpr", &atts_enable);
......@@ -563,21 +563,21 @@ uint32_t d2s::GTPeCard::readbackATTSOutputEnables()
}
void d2s::GTPeCard::setSTTSInputMask (uint32_t mask)
throw (HAL::HardwareAccessException) {
{
_gtpe->write("Mask_sTTS", mask);
}
void d2s::GTPeCard::setATTSInputMask (uint32_t mask)
throw (HAL::HardwareAccessException) {
{
_gtpe->write("Mask_aTTS", mask);
}
uint32_t d2s::GTPeCard::readbackSTTSInputMask ()
throw (HAL::HardwareAccessException) {
{
uint32_t mask;
_gtpe->read("Mask_sTTS", &mask);
......@@ -586,7 +586,7 @@ uint32_t d2s::GTPeCard::readbackSTTSInputMask ()
}
uint32_t d2s::GTPeCard::readbackATTSInputMask ()
throw (HAL::HardwareAccessException) {
{
uint32_t mask;
_gtpe->read("Mask_aTTS", &mask);
......@@ -615,7 +615,7 @@ void d2s::GTPeCard::lock()
void d2s::GTPeCard::unlock()
throw (ipcutils::exception::Exception) {
{
if ( _haveMasterLock ) {
_sa.give(0); // relase system wide semaphore
......@@ -727,7 +727,7 @@ uint32_t d2s::GTPeCard::readbackPartitionRunNumber(uint32_t i_part)
void d2s::GTPeCard::resyncDetPartitions (uint32_t detPartitionMask)
throw (HAL::HardwareAccessException) {
{
_gtpe->write("resyncDetParts", detPartitionMask);
_gtpe->write("resyncDetParts", 0x0);
......
......@@ -25,7 +25,7 @@
#include <iostream>
d2s::GTPeCrate::GTPeCrate(bool dummy)
throw (HAL::HardwareAccessException, xcept::Exception)
: _busadapter(0),
_gtpe_addresstable(0),
_gtpe(0) {
......@@ -101,7 +101,7 @@ d2s::GTPeCrate::~GTPeCrate() {
}
d2s::GTPeCard& d2s::GTPeCrate::getGTPe()
throw (xcept::Exception) {
{
if (_gtpe == 0)
XCEPT_RAISE (xcept::Exception, "GTPe not present.");
......
......@@ -20,7 +20,7 @@ d2s::GTPeStatus::~GTPeStatus() {
}
tts::TTSState d2s::GTPeStatus::getDetPartitionInputState(uint32_t part_idx)
throw (xcept::Exception) {
{
if (part_idx > 7)
XCEPT_RAISE(xcept::Exception, "partition index out of range");
......@@ -29,7 +29,7 @@ tts::TTSState d2s::GTPeStatus::getDetPartitionInputState(uint32_t part_idx)
}
tts::TTSState d2s::GTPeStatus::getDAQPartitionInputState(uint32_t part_idx)
throw (xcept::Exception) {
{
if (part_idx > 7)
XCEPT_RAISE(xcept::Exception, "partition index out of range");
......@@ -38,7 +38,7 @@ tts::TTSState d2s::GTPeStatus::getDAQPartitionInputState(uint32_t part_idx)
}
tts::TTSState d2s::GTPeStatus::getTCSPartitionState(uint32_t part_idx)
throw (xcept::Exception) {
{
if (part_idx > 7)
XCEPT_RAISE(xcept::Exception, "partition index out of range");
......@@ -47,7 +47,7 @@ tts::TTSState d2s::GTPeStatus::getTCSPartitionState(uint32_t part_idx)
}
bool d2s::GTPeStatus::isTCSPartitionActive(uint32_t part_idx)
throw (xcept::Exception) {
{
if (part_idx > 7)
XCEPT_RAISE(xcept::Exception, "partition index out of range");
......
......@@ -20,7 +20,7 @@
GETPACKAGEINFO(d2sgtpe)
void d2sgtpe::checkPackageDependencies() throw (config::PackageInfo::VersionException)
void d2sgtpe::checkPackageDependencies()
{
CHECKDEPENDENCY(ttsttsbase);
CHECKDEPENDENCY(ttsipcutils);
......
......@@ -43,7 +43,7 @@ namespace d2sgtpecontroller
const std::string summary = "d2sgtpecontroller";
const std::string link = "http://xdaqwiki.cern.ch/index.php";
config::PackageInfo getPackageInfo();
void checkPackageDependencies() throw (config::PackageInfo::VersionException);
void checkPackageDependencies() ;
std::set<std::string, std::less<std::string> > getPackageDependencies();
}
......
......@@ -43,7 +43,7 @@
XDAQ_INSTANTIATOR_IMPL(d2s::GTPeController);
d2s::GTPeController::GTPeController(xdaq::ApplicationStub * s)
throw (xdaq::exception::Exception)
: xdaq::WebApplication(s),
_runNumber(0),
_gtpecrate(0),
......@@ -200,7 +200,7 @@ void d2s::GTPeController::cleanup() {
}
void d2s::GTPeController::displayDefaultWebPage(xgi::Input * in, xgi::Output * out )
throw (xgi::exception::Exception) {
{
_gtpecrate->getGTPe().lock();
try {
......@@ -215,7 +215,7 @@ void d2s::GTPeController::displayDefaultWebPage(xgi::Input * in, xgi::Output * o
}