From f3fbad5d8068230dcf0644e0f939b8116f1dea2f Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Wed, 31 Jul 2013 15:20:49 +0000 Subject: QPID-4942: Include file not part of supported API (missed out from earlier commit) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1508915 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/include/qpid/Exception.h | 91 -------------------------------------------- cpp/src/qpid/Exception.h | 91 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 91 deletions(-) delete mode 100644 cpp/include/qpid/Exception.h create mode 100644 cpp/src/qpid/Exception.h diff --git a/cpp/include/qpid/Exception.h b/cpp/include/qpid/Exception.h deleted file mode 100644 index cbd175214d..0000000000 --- a/cpp/include/qpid/Exception.h +++ /dev/null @@ -1,91 +0,0 @@ -#ifndef _Exception_ -#define _Exception_ - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "qpid/framing/amqp_types.h" -#include "qpid/framing/constants.h" -#include "qpid/framing/enum.h" -#include "qpid/sys/StrError.h" -#include "qpid/CommonImportExport.h" -#include -#include - -namespace qpid -{ - -/** - * Base class for Qpid runtime exceptions. - */ -class QPID_COMMON_CLASS_EXTERN Exception : public std::exception -{ - public: - QPID_COMMON_EXTERN explicit Exception(const std::string& message=std::string()) throw(); - QPID_COMMON_EXTERN virtual ~Exception() throw(); - QPID_COMMON_EXTERN virtual const char* what() const throw(); // prefix: message - QPID_COMMON_EXTERN virtual std::string getMessage() const; // Unprefixed message - QPID_COMMON_EXTERN virtual std::string getPrefix() const; // Prefix - - private: - std::string message; - mutable std::string whatStr; -}; - -/** Exception that includes an errno message. */ -struct QPID_COMMON_CLASS_EXTERN ErrnoException : public Exception { - ErrnoException(const std::string& msg, int err) : Exception(msg+": "+qpid::sys::strError(err)) {} - ErrnoException(const std::string& msg) : Exception(msg+": "+qpid::sys::strError(errno)) {} -}; - -struct QPID_COMMON_CLASS_EXTERN SessionException : public Exception { - const framing::execution::ErrorCode code; - SessionException(framing::execution::ErrorCode code_, const std::string& message) - : Exception(message), code(code_) {} -}; - -struct QPID_COMMON_CLASS_EXTERN ChannelException : public Exception { - const framing::session::DetachCode code; - ChannelException(framing::session::DetachCode _code, const std::string& message) - : Exception(message), code(_code) {} -}; - -struct QPID_COMMON_CLASS_EXTERN ConnectionException : public Exception { - const framing::connection::CloseCode code; - ConnectionException(framing::connection::CloseCode _code, const std::string& message) - : Exception(message), code(_code) {} -}; - -struct QPID_COMMON_CLASS_EXTERN ClosedException : public Exception { - QPID_COMMON_EXTERN ClosedException(const std::string& msg=std::string()); - QPID_COMMON_EXTERN std::string getPrefix() const; -}; - -/** - * Exception representing transport failure - */ -struct TransportFailure : public Exception { - TransportFailure(const std::string& msg=std::string()) : Exception(msg) {} -}; - -} // namespace qpid - -#endif /*!_Exception_*/ diff --git a/cpp/src/qpid/Exception.h b/cpp/src/qpid/Exception.h new file mode 100644 index 0000000000..cbd175214d --- /dev/null +++ b/cpp/src/qpid/Exception.h @@ -0,0 +1,91 @@ +#ifndef _Exception_ +#define _Exception_ + +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +#include "qpid/framing/amqp_types.h" +#include "qpid/framing/constants.h" +#include "qpid/framing/enum.h" +#include "qpid/sys/StrError.h" +#include "qpid/CommonImportExport.h" +#include +#include + +namespace qpid +{ + +/** + * Base class for Qpid runtime exceptions. + */ +class QPID_COMMON_CLASS_EXTERN Exception : public std::exception +{ + public: + QPID_COMMON_EXTERN explicit Exception(const std::string& message=std::string()) throw(); + QPID_COMMON_EXTERN virtual ~Exception() throw(); + QPID_COMMON_EXTERN virtual const char* what() const throw(); // prefix: message + QPID_COMMON_EXTERN virtual std::string getMessage() const; // Unprefixed message + QPID_COMMON_EXTERN virtual std::string getPrefix() const; // Prefix + + private: + std::string message; + mutable std::string whatStr; +}; + +/** Exception that includes an errno message. */ +struct QPID_COMMON_CLASS_EXTERN ErrnoException : public Exception { + ErrnoException(const std::string& msg, int err) : Exception(msg+": "+qpid::sys::strError(err)) {} + ErrnoException(const std::string& msg) : Exception(msg+": "+qpid::sys::strError(errno)) {} +}; + +struct QPID_COMMON_CLASS_EXTERN SessionException : public Exception { + const framing::execution::ErrorCode code; + SessionException(framing::execution::ErrorCode code_, const std::string& message) + : Exception(message), code(code_) {} +}; + +struct QPID_COMMON_CLASS_EXTERN ChannelException : public Exception { + const framing::session::DetachCode code; + ChannelException(framing::session::DetachCode _code, const std::string& message) + : Exception(message), code(_code) {} +}; + +struct QPID_COMMON_CLASS_EXTERN ConnectionException : public Exception { + const framing::connection::CloseCode code; + ConnectionException(framing::connection::CloseCode _code, const std::string& message) + : Exception(message), code(_code) {} +}; + +struct QPID_COMMON_CLASS_EXTERN ClosedException : public Exception { + QPID_COMMON_EXTERN ClosedException(const std::string& msg=std::string()); + QPID_COMMON_EXTERN std::string getPrefix() const; +}; + +/** + * Exception representing transport failure + */ +struct TransportFailure : public Exception { + TransportFailure(const std::string& msg=std::string()) : Exception(msg) {} +}; + +} // namespace qpid + +#endif /*!_Exception_*/ -- cgit v1.2.1