Commit 7be3b841 authored by Steven Murray's avatar Steven Murray
Browse files

Removed throw() from mediachanger hpp and cpp files

parent 12443dde
......@@ -23,7 +23,7 @@
//------------------------------------------------------------------------------
// constructor
//------------------------------------------------------------------------------
cta::mediachanger::AcsLibrarySlot::AcsLibrarySlot() throw():
cta::mediachanger::AcsLibrarySlot::AcsLibrarySlot():
LibrarySlot(TAPE_LIBRARY_TYPE_ACS),
m_acs(0),
m_lsm(0),
......@@ -47,7 +47,7 @@ std::string cta::mediachanger::AcsLibrarySlot::librarySlotToString(
// constructor
//------------------------------------------------------------------------------
cta::mediachanger::AcsLibrarySlot::AcsLibrarySlot(const uint32_t acs,
const uint32_t lsm, const uint32_t panel, const uint32_t drive) throw():
const uint32_t lsm, const uint32_t panel, const uint32_t drive):
LibrarySlot(TAPE_LIBRARY_TYPE_ACS),
m_acs(acs),
m_lsm(lsm),
......@@ -59,7 +59,7 @@ cta::mediachanger::AcsLibrarySlot::AcsLibrarySlot(const uint32_t acs,
//------------------------------------------------------------------------------
// destructor
//------------------------------------------------------------------------------
cta::mediachanger::AcsLibrarySlot::~AcsLibrarySlot() throw() {
cta::mediachanger::AcsLibrarySlot::~AcsLibrarySlot() {
}
//------------------------------------------------------------------------------
......@@ -73,27 +73,27 @@ cta::mediachanger::LibrarySlot *cta::mediachanger::AcsLibrarySlot::
//------------------------------------------------------------------------------
// getAcs
//------------------------------------------------------------------------------
uint32_t cta::mediachanger::AcsLibrarySlot::getAcs() const throw () {
uint32_t cta::mediachanger::AcsLibrarySlot::getAcs() const {
return m_acs;
}
//------------------------------------------------------------------------------
// getLsm
//------------------------------------------------------------------------------
uint32_t cta::mediachanger::AcsLibrarySlot::getLsm() const throw () {
uint32_t cta::mediachanger::AcsLibrarySlot::getLsm() const {
return m_lsm;
}
//------------------------------------------------------------------------------
// getPanel
//------------------------------------------------------------------------------
uint32_t cta::mediachanger::AcsLibrarySlot::getPanel() const throw () {
uint32_t cta::mediachanger::AcsLibrarySlot::getPanel() const {
return m_panel;
}
//------------------------------------------------------------------------------
// getDrive
//------------------------------------------------------------------------------
uint32_t cta::mediachanger::AcsLibrarySlot::getDrive() const throw () {
uint32_t cta::mediachanger::AcsLibrarySlot::getDrive() const {
return m_drive;
}
......@@ -35,7 +35,7 @@ public:
/**
* Default constructor that sets all integer members to 0.
*/
AcsLibrarySlot() throw();
AcsLibrarySlot();
/**
* Constructor.
......@@ -46,12 +46,12 @@ public:
* @param drive The drive component of the library slot.
*/
AcsLibrarySlot(const uint32_t acs, const uint32_t lsm,
const uint32_t panel, const uint32_t drive) throw();
const uint32_t panel, const uint32_t drive);
/**
* Destructor.
*/
~AcsLibrarySlot() throw();
~AcsLibrarySlot();
/**
* Creates a clone of this object.
......@@ -65,28 +65,28 @@ public:
*
* @return the acs component of the library slot.
*/
uint32_t getAcs() const throw();
uint32_t getAcs() const;
/**
* Gets the lsm component of the library slot.
*
* @return the lsm component of the library slot.
*/
uint32_t getLsm() const throw();
uint32_t getLsm() const;
/**
* Gets the panel component of the library slot.
*
* @return the panel component of the library slot.
*/
uint32_t getPanel() const throw();
uint32_t getPanel() const;
/**
* Gets the drive component of the library slot.
*
* @return the drive component of the library slot.
*/
uint32_t getDrive() const throw();
uint32_t getDrive() const;
private:
......
......@@ -171,7 +171,7 @@ Frame createAcsForceDismountTapeFrame(const std::string &vid, const AcsLibrarySl
//------------------------------------------------------------------------------
// constructor
//------------------------------------------------------------------------------
AcsProxy::AcsProxy(const unsigned short serverPort) throw():
AcsProxy::AcsProxy(const unsigned short serverPort):
m_serverPort(serverPort) {
}
......
......@@ -40,7 +40,7 @@ public:
* @param serverPort The TCP/IP port on which the CASTOR ACS daemon is
* listening for ZMQ messages.
*/
AcsProxy(const unsigned short serverPort = ACS_PORT) throw();
AcsProxy(const unsigned short serverPort = ACS_PORT);
/**
* Request the CASTOR ACS daemon to mount the specified tape for read-only
......
......@@ -25,7 +25,7 @@ cta::mediachanger::CmdLineTool::CmdLineTool(
std::istream &inStream,
std::ostream &outStream,
std::ostream &errStream,
MediaChangerFacade &mc) throw():
MediaChangerFacade &mc):
m_in(inStream),
m_out(outStream),
m_err(errStream),
......@@ -37,13 +37,13 @@ cta::mediachanger::CmdLineTool::CmdLineTool(
//------------------------------------------------------------------------------
// destructor
//------------------------------------------------------------------------------
cta::mediachanger::CmdLineTool::~CmdLineTool() throw() {
cta::mediachanger::CmdLineTool::~CmdLineTool() {
}
//------------------------------------------------------------------------------
// bool2Str
//------------------------------------------------------------------------------
std::string cta::mediachanger::CmdLineTool::bool2Str(const bool value)
const throw() {
const {
return value ? "TRUE" : "FALSE";
}
......@@ -44,12 +44,12 @@ public:
*/
CmdLineTool(std::istream &inStream, std::ostream &outStream,
std::ostream &errStream, MediaChangerFacade &mc)
throw();
;
/**
* Pure-virtual destructor to guarantee this class is abstract.
*/
virtual ~CmdLineTool() throw() = 0;
virtual ~CmdLineTool() = 0;
protected:
......@@ -92,7 +92,7 @@ protected:
*
* @param value The boolean value.
*/
std::string bool2Str(const bool value) const throw();
std::string bool2Str(const bool value) const;
}; // class CmdLineTool
......
......@@ -34,7 +34,7 @@ cta::mediachanger::DebugBuf::~DebugBuf() {
//------------------------------------------------------------------------------
// setDebug
//------------------------------------------------------------------------------
void cta::mediachanger::DebugBuf::setDebug(const bool value) throw() {
void cta::mediachanger::DebugBuf::setDebug(const bool value) {
m_debug = value;
}
......@@ -64,6 +64,6 @@ std::streambuf::int_type cta::mediachanger::DebugBuf::overflow(
//------------------------------------------------------------------------------
// writePreamble
//------------------------------------------------------------------------------
void cta::mediachanger::DebugBuf::writePreamble() throw() {
void cta::mediachanger::DebugBuf::writePreamble() {
m_os << "DEBUG: ";
}
......@@ -55,7 +55,7 @@ public:
*
* The default set in the constructor is off (false).
*/
void setDebug(const bool value) throw();
void setDebug(const bool value);
protected:
......@@ -67,7 +67,7 @@ protected:
/**
* Writes the standard preamble to the output stream.
*/
void writePreamble() throw();
void writePreamble();
private:
......
......@@ -27,14 +27,14 @@
//------------------------------------------------------------------------------
cta::mediachanger::DismountCmd::DismountCmd(
std::istream &inStream, std::ostream &outStream, std::ostream &errStream,
MediaChangerFacade &mc) throw():
MediaChangerFacade &mc):
CmdLineTool(inStream, outStream, errStream, mc) {
}
//------------------------------------------------------------------------------
// destructor
//------------------------------------------------------------------------------
cta::mediachanger::DismountCmd::~DismountCmd() throw() {
cta::mediachanger::DismountCmd::~DismountCmd() {
// Do nothing
}
......
......@@ -44,12 +44,12 @@ public:
* @param mc Interface to the media changer.
*/
DismountCmd(std::istream &inStream, std::ostream &outStream,
std::ostream &errStream, MediaChangerFacade &mc) throw();
std::ostream &errStream, MediaChangerFacade &mc);
/**
* Destructor.
*/
virtual ~DismountCmd() throw();
virtual ~DismountCmd();
/**
* The entry function of the command.
......
......@@ -26,7 +26,7 @@
//-----------------------------------------------------------------------------
// constructor
//-----------------------------------------------------------------------------
cta::mediachanger::DismountCmdLine::DismountCmdLine() throw():
cta::mediachanger::DismountCmdLine::DismountCmdLine():
m_debug(false),
m_help(false),
m_driveLibrarySlot(0),
......@@ -101,7 +101,7 @@ cta::mediachanger::DismountCmdLine::DismountCmdLine(
//-----------------------------------------------------------------------------
// destructor
//-----------------------------------------------------------------------------
cta::mediachanger::DismountCmdLine::~DismountCmdLine() throw() {
cta::mediachanger::DismountCmdLine::~DismountCmdLine() {
delete m_driveLibrarySlot;
}
......@@ -129,7 +129,7 @@ cta::mediachanger::DismountCmdLine &cta::mediachanger::DismountCmdLine::
//------------------------------------------------------------------------------
// getForce
//------------------------------------------------------------------------------
bool cta::mediachanger::DismountCmdLine::getForce() const throw() {
bool cta::mediachanger::DismountCmdLine::getForce() const {
return m_force;
}
......@@ -172,7 +172,7 @@ void cta::mediachanger::DismountCmdLine::processOption(const int opt) {
//------------------------------------------------------------------------------
// getUsage
//------------------------------------------------------------------------------
std::string cta::mediachanger::DismountCmdLine::getUsage() throw() {
std::string cta::mediachanger::DismountCmdLine::getUsage() {
return std::string() +
"Usage:\n"
"\n"
......@@ -201,14 +201,14 @@ std::string cta::mediachanger::DismountCmdLine::getUsage() throw() {
//------------------------------------------------------------------------------
// getDebug
//------------------------------------------------------------------------------
bool cta::mediachanger::DismountCmdLine::getDebug() const throw() {
bool cta::mediachanger::DismountCmdLine::getDebug() const {
return m_debug;
}
//------------------------------------------------------------------------------
// getHelp
//------------------------------------------------------------------------------
bool cta::mediachanger::DismountCmdLine::getHelp() const throw() {
bool cta::mediachanger::DismountCmdLine::getHelp() const {
return m_help;
}
......@@ -216,7 +216,7 @@ bool cta::mediachanger::DismountCmdLine::getHelp() const throw() {
// getVid
//------------------------------------------------------------------------------
const std::string &cta::mediachanger::DismountCmdLine::getVid()
const throw() {
const {
return m_vid;
}
......
......@@ -35,7 +35,7 @@ public:
/**
* Constructor.
*/
DismountCmdLine() throw();
DismountCmdLine();
/**
* Constructor.
......@@ -57,7 +57,7 @@ public:
/**
* Destructor.
*/
~DismountCmdLine() throw();
~DismountCmdLine();
/**
* Assignment oprator.
......@@ -71,28 +71,28 @@ public:
*
* @return The usage message.
*/
static std::string getUsage() throw();
static std::string getUsage();
/**
* Gets the value of the debug option.
*
* @return True if the debug option has been set.
*/
bool getDebug() const throw();
bool getDebug() const;
/**
* Gets the value of the help option.
*
* @return True if the help option has been set.
*/
bool getHelp() const throw();
bool getHelp() const;
/**
* Gets the volume identifier of the tape to be mounted.
*
* @return The volume identifier of the tape to be mounted.
*/
const std::string &getVid() const throw();
const std::string &getVid() const;
/**
* Gets the slot in the tape library where the drive is located.
......@@ -107,7 +107,7 @@ public:
* @return True if the dismount should be forced. Forcing a dismount means
* rewinding and ejecting the tape where necessary.
*/
bool getForce() const throw();
bool getForce() const;
/**
* Return sthe program name.
......
......@@ -23,14 +23,14 @@
// constructor
//------------------------------------------------------------------------------
cta::mediachanger::LibrarySlot::LibrarySlot(
const TapeLibraryType libraryType) throw():
const TapeLibraryType libraryType):
m_libraryType(libraryType) {
}
//------------------------------------------------------------------------------
// destructor
//------------------------------------------------------------------------------
cta::mediachanger::LibrarySlot::~LibrarySlot() throw() {
cta::mediachanger::LibrarySlot::~LibrarySlot() {
}
//------------------------------------------------------------------------------
......@@ -52,7 +52,7 @@ cta::mediachanger::TapeLibraryType cta::mediachanger::LibrarySlot::
// str
//------------------------------------------------------------------------------
const std::string &cta::mediachanger::LibrarySlot::str() const
throw() {
{
return m_str;
}
......@@ -60,6 +60,6 @@ const std::string &cta::mediachanger::LibrarySlot::str() const
// getLibraryType
//------------------------------------------------------------------------------
cta::mediachanger::TapeLibraryType
cta::mediachanger::LibrarySlot::getLibraryType() const throw() {
cta::mediachanger::LibrarySlot::getLibraryType() const {
return m_libraryType;
}
......@@ -37,14 +37,14 @@ protected:
*
* @param libraryType The library type of the slot.
*/
LibrarySlot(const TapeLibraryType libraryType) throw();
LibrarySlot(const TapeLibraryType libraryType);
public:
/**
* Destructor.
*/
virtual ~LibrarySlot() throw() = 0;
virtual ~LibrarySlot() = 0;
/**
* Creates a clone of this object.
......@@ -58,12 +58,12 @@ public:
*
* @return The string representation of this tape library slot.
*/
const std::string &str() const throw();
const std::string &str() const;
/**
* Returns the type of the tape library to which this library slot refers.
*/
TapeLibraryType getLibraryType() const throw();
TapeLibraryType getLibraryType() const;
protected:
......
......@@ -63,7 +63,7 @@ cta::mediachanger::TapeLibraryType cta::mediachanger::LibrarySlotParser::
// isAcs
//------------------------------------------------------------------------------
bool cta::mediachanger::LibrarySlotParser::isAcs(const std::string &str)
throw() {
{
return 0 == str.find("acs");
}
......@@ -71,7 +71,7 @@ bool cta::mediachanger::LibrarySlotParser::isAcs(const std::string &str)
// isManual
//------------------------------------------------------------------------------
bool cta::mediachanger::LibrarySlotParser::isManual(const std::string &str)
throw() {
{
return 0 == str.find("manual");
}
......@@ -79,7 +79,7 @@ bool cta::mediachanger::LibrarySlotParser::isManual(const std::string &str)
// isScsi
//------------------------------------------------------------------------------
bool cta::mediachanger::LibrarySlotParser::isScsi(const std::string &str)
throw() {
{
return 0 == str.find("smc");
}
......
......@@ -72,7 +72,7 @@ private:
* @param str The string representation of the tape library slot.
* @return True if the type if the library slot is ACS.
*/
static bool isAcs(const std::string &str) throw();
static bool isAcs(const std::string &str);
/**
* Returns true if the type of the specified tape library slot is manual.
......@@ -80,7 +80,7 @@ private:
* @param str The string representation of the tape library slot.
* @return True if the type of the library slot is a manual.
*/
static bool isManual(const std::string &str) throw();
static bool isManual(const std::string &str);
/**
* Returns true if the type of the specified tape library slot is SCSI.
......@@ -88,7 +88,7 @@ private:
* @param str The string representation of the tape library slot.
* @return True if the type of the library slot is a manual.
*/
static bool isScsi(const std::string &str) throw();
static bool isScsi(const std::string &str);
/**
* Parses the specified string representation of a library slot taking into
......
......@@ -24,7 +24,7 @@
// constructor
//------------------------------------------------------------------------------
cta::mediachanger::ManualLibrarySlot::ManualLibrarySlot()
throw():
:
LibrarySlot(TAPE_LIBRARY_TYPE_MANUAL) {
m_str = "manual";
}
......@@ -48,7 +48,7 @@ cta::mediachanger::ManualLibrarySlot::ManualLibrarySlot(
//------------------------------------------------------------------------------
// destructor
//------------------------------------------------------------------------------
cta::mediachanger::ManualLibrarySlot::~ManualLibrarySlot() throw() {
cta::mediachanger::ManualLibrarySlot::~ManualLibrarySlot() {
}
//------------------------------------------------------------------------------
......
......@@ -34,7 +34,7 @@ public:
*
* Sets all string member-variables to the empty string.
*/
ManualLibrarySlot() throw();
ManualLibrarySlot();
/**
* Constructor.
......@@ -49,7 +49,7 @@ public:
/**
* Destructor.
*/
~ManualLibrarySlot() throw();
~ManualLibrarySlot();
/**
* Creates a clone of this object.
......
......@@ -25,7 +25,7 @@ namespace mediachanger {
//------------------------------------------------------------------------------
// constructor
//------------------------------------------------------------------------------
MediaChangerFacade::MediaChangerFacade(log::Logger &log) throw():
MediaChangerFacade::MediaChangerFacade(log::Logger &log):
m_mmcProxy(log) {
}
......
......@@ -44,7 +44,7 @@ public:
* object will be used by the manual media changer to communicate with the
* tape operator.
*/
MediaChangerFacade(log::Logger &log) throw();
MediaChangerFacade(log::Logger &log);
/**
* Requests the media changer to mount the specified tape for read-only
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment