From ff1f9a05fe831a4b7ddbab177934e08ec23031a6 Mon Sep 17 00:00:00 2001
From: Steven Murray <murrayc3@cern.ch>
Date: Wed, 15 Aug 2012 08:50:46 +0000
Subject: [PATCH] Corrected the throw clause of the assignment operator method
of the SmartFILEPtr class.
---
castor/tape/utils/SmartFILEPtr.cpp | 5 +++--
castor/tape/utils/SmartFILEPtr.hpp | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/castor/tape/utils/SmartFILEPtr.cpp b/castor/tape/utils/SmartFILEPtr.cpp
index a61fdf2380..f7be8eaa88 100644
--- a/castor/tape/utils/SmartFILEPtr.cpp
+++ b/castor/tape/utils/SmartFILEPtr.cpp
@@ -68,7 +68,8 @@ void castor::tape::utils::SmartFILEPtr::reset(FILE *const file = NULL)
// SmartFILEPtr assignment operator
//-----------------------------------------------------------------------------
castor::tape::utils::SmartFILEPtr
- &castor::tape::utils::SmartFILEPtr::operator=(SmartFILEPtr& obj) throw() {
+ &castor::tape::utils::SmartFILEPtr::operator=(SmartFILEPtr& obj)
+ throw(castor::exception::Exception) {
reset(obj.release());
@@ -79,7 +80,7 @@ castor::tape::utils::SmartFILEPtr
//-----------------------------------------------------------------------------
// destructor
//-----------------------------------------------------------------------------
-castor::tape::utils::SmartFILEPtr::~SmartFILEPtr() {
+castor::tape::utils::SmartFILEPtr::~SmartFILEPtr() throw() {
reset();
}
diff --git a/castor/tape/utils/SmartFILEPtr.hpp b/castor/tape/utils/SmartFILEPtr.hpp
index 794b35e19b..1cbfc63545 100644
--- a/castor/tape/utils/SmartFILEPtr.hpp
+++ b/castor/tape/utils/SmartFILEPtr.hpp
@@ -76,14 +76,15 @@ public:
* previous owner (obj).
* </ul>
*/
- SmartFILEPtr &operator=(SmartFILEPtr& obj) throw();
+ SmartFILEPtr &operator=(SmartFILEPtr& obj)
+ throw(castor::exception::Exception) ;
/**
* Destructor.
*
* Closes the owned FILE pointer if there is one.
*/
- ~SmartFILEPtr();
+ ~SmartFILEPtr() throw();
/**
* Returns the owned pointer or NULL if this smart pointer does not own one.
--
GitLab