Commit d606f24a authored by Victor Kotlyar's avatar Victor Kotlyar
Browse files

Renamed castor::exception::NotAnOwner to

cta::exception::NotAnOwner
parent 5369b171
...@@ -79,6 +79,7 @@ set (COMMON_LIB_SRC_FILES ...@@ -79,6 +79,7 @@ set (COMMON_LIB_SRC_FILES
exception/MissingOperand.cpp exception/MissingOperand.cpp
exception/NoEntry.cpp exception/NoEntry.cpp
exception/NoPortInRange.cpp exception/NoPortInRange.cpp
exception/NotAnOwner.cpp
log/DummyLogger.cpp log/DummyLogger.cpp
log/LogContext.cpp log/LogContext.cpp
log/Logger.cpp log/Logger.cpp
......
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
* @author Castor Dev team, castor-dev@cern.ch * @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/ *****************************************************************************/
#include "castor/exception/NotAnOwner.hpp" #include "common/exception/NotAnOwner.hpp"
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Constructor // Constructor
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
castor::exception::NotAnOwner::NotAnOwner(): cta::exception::NotAnOwner::NotAnOwner():
cta::exception::Exception() { cta::exception::Exception() {
} }
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "common/exception/Exception.hpp" #include "common/exception/Exception.hpp"
namespace castor { namespace exception { namespace cta { namespace exception {
/** /**
* Not an owner. * Not an owner.
...@@ -41,5 +41,5 @@ namespace castor { namespace exception { ...@@ -41,5 +41,5 @@ namespace castor { namespace exception {
}; // class NotAnOwner }; // class NotAnOwner
} } // namespace castor exception } } // namespace cta exception
...@@ -94,7 +94,7 @@ void *castor::messages::SmartZmqContext::get() const throw() { ...@@ -94,7 +94,7 @@ void *castor::messages::SmartZmqContext::get() const throw() {
void *castor::messages::SmartZmqContext::release() { void *castor::messages::SmartZmqContext::release() {
// If this smart pointer does not own a ZMQ context // If this smart pointer does not own a ZMQ context
if(NULL == m_zmqContext) { if(NULL == m_zmqContext) {
castor::exception::NotAnOwner ex; cta::exception::NotAnOwner ex;
ex.getMessage() << "Smart pointer does not own a ZMQ context"; ex.getMessage() << "Smart pointer does not own a ZMQ context";
throw ex; throw ex;
} }
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#pragma once #pragma once
#include "castor/exception/NotAnOwner.hpp" #include "common/exception/NotAnOwner.hpp"
#include <stdio.h> #include <stdio.h>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#pragma once #pragma once
#include "castor/exception/NotAnOwner.hpp" #include "common/exception/NotAnOwner.hpp"
#include <stdio.h> #include <stdio.h>
#include <zmq.h> #include <zmq.h>
......
...@@ -31,7 +31,6 @@ set (UTILS_LIB_SRC_FILES ...@@ -31,7 +31,6 @@ set (UTILS_LIB_SRC_FILES
utils.cpp utils.cpp
../common/CastorConfiguration.cpp ../common/CastorConfiguration.cpp
../exception/Errnum.cpp ../exception/Errnum.cpp
../exception/NotAnOwner.cpp
../exception/TimeOut.cpp ../exception/TimeOut.cpp
../exception/OutOfMemory.cpp ../exception/OutOfMemory.cpp
../BaseObject.cpp ../BaseObject.cpp
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#pragma once #pragma once
#include "castor/exception/NotAnOwner.hpp" #include "common/exception/NotAnOwner.hpp"
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
...@@ -119,7 +119,7 @@ public: ...@@ -119,7 +119,7 @@ public:
T *release() { T *release() {
// If this smart pointer does not own a pointer // If this smart pointer does not own a pointer
if(NULL == m_arrayPtr) { if(NULL == m_arrayPtr) {
castor::exception::NotAnOwner ex; cta::exception::NotAnOwner ex;
ex.getMessage() << "Smart pointer does not own a pointer"; ex.getMessage() << "Smart pointer does not own a pointer";
throw(ex); throw(ex);
} }
......
...@@ -77,7 +77,7 @@ TEST_F(castor_utils_SmartArrayPtrTest, assignment) { ...@@ -77,7 +77,7 @@ TEST_F(castor_utils_SmartArrayPtrTest, assignment) {
TEST_F(castor_utils_SmartArrayPtrTest, releaseNull) { TEST_F(castor_utils_SmartArrayPtrTest, releaseNull) {
castor::utils::SmartArrayPtr<char> smartPtr; castor::utils::SmartArrayPtr<char> smartPtr;
ASSERT_THROW(smartPtr.release(), castor::exception::NotAnOwner); ASSERT_THROW(smartPtr.release(), cta::exception::NotAnOwner);
} }
TEST_F(castor_utils_SmartArrayPtrTest, subscriptRead) { TEST_F(castor_utils_SmartArrayPtrTest, subscriptRead) {
......
...@@ -87,7 +87,7 @@ FILE *castor::utils::SmartFILEPtr::get() const throw() { ...@@ -87,7 +87,7 @@ FILE *castor::utils::SmartFILEPtr::get() const throw() {
FILE *castor::utils::SmartFILEPtr::release() { FILE *castor::utils::SmartFILEPtr::release() {
// If this smart pointer does not own a pointer // If this smart pointer does not own a pointer
if(NULL == m_file) { if(NULL == m_file) {
castor::exception::NotAnOwner ex; cta::exception::NotAnOwner ex;
ex.getMessage() << "Smart pointer does not own a FILE pointer"; ex.getMessage() << "Smart pointer does not own a FILE pointer";
throw ex; throw ex;
} }
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#pragma once #pragma once
#include "castor/exception/NotAnOwner.hpp" #include "common/exception/NotAnOwner.hpp"
#include <stdio.h> #include <stdio.h>
......
...@@ -104,7 +104,7 @@ int castor::utils::SmartFd::get() const throw() { ...@@ -104,7 +104,7 @@ int castor::utils::SmartFd::get() const throw() {
int castor::utils::SmartFd::release() { int castor::utils::SmartFd::release() {
// If this SmartFd does not own a file descriptor // If this SmartFd does not own a file descriptor
if(m_fd < 0) { if(m_fd < 0) {
castor::exception::NotAnOwner ex; cta::exception::NotAnOwner ex;
ex.getMessage() << "Smart file-descriptor does not own a file-descriptor"; ex.getMessage() << "Smart file-descriptor does not own a file-descriptor";
throw ex; throw ex;
} }
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#pragma once #pragma once
#include "castor/exception/NotAnOwner.hpp" #include "common/exception/NotAnOwner.hpp"
namespace castor { namespace castor {
namespace utils { namespace utils {
......
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