From 3baba3c1462930d78662492e0a083d63822b33d0 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Tue, 15 Dec 2009 08:23:19 +0000 Subject: QPID-2212: revert previous attempt at fix; disable on windows only git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@890683 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/examples/messaging/CMakeLists.txt | 10 +++-- cpp/include/qpid/sys/ExceptionHolder.h | 74 +++++++++++++++++++++++++++++++++ cpp/src/Makefile.am | 2 +- cpp/src/qpid/sys/ExceptionHolder.h | 75 ---------------------------------- 4 files changed, 81 insertions(+), 80 deletions(-) create mode 100644 cpp/include/qpid/sys/ExceptionHolder.h delete mode 100644 cpp/src/qpid/sys/ExceptionHolder.h (limited to 'cpp') diff --git a/cpp/examples/messaging/CMakeLists.txt b/cpp/examples/messaging/CMakeLists.txt index 7c023e602a..88ab81dae9 100644 --- a/cpp/examples/messaging/CMakeLists.txt +++ b/cpp/examples/messaging/CMakeLists.txt @@ -17,10 +17,12 @@ # under the License. # -# disabling spout & drain under cmake until build issues on windows -# are resolved (QPID-2212): -#add_example(messaging drain ${Boost_PROGRAM_OPTIONS_LIBRARY}) -#add_example(messaging spout ${Boost_PROGRAM_OPTIONS_LIBRARY}) +# disabling spout & drain on windows until build issues are resolved +# (QPID-2212): +if (NOT MSVC) + add_example(messaging drain) + add_example(messaging spout) +endif (NOT MSVC) add_example(messaging queue_receiver) add_example(messaging queue_sender) diff --git a/cpp/include/qpid/sys/ExceptionHolder.h b/cpp/include/qpid/sys/ExceptionHolder.h new file mode 100644 index 0000000000..9eff1d64c7 --- /dev/null +++ b/cpp/include/qpid/sys/ExceptionHolder.h @@ -0,0 +1,74 @@ +#ifndef QPID_EXCEPTIONHOLDER_H +#define QPID_EXCEPTIONHOLDER_H + +/* + * + * 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 + + +namespace qpid { +namespace sys { + +struct Raisable { + virtual ~Raisable() {}; + virtual void raise() const=0; + virtual std::string what() const=0; +}; + +/** + * Holder for exceptions. Allows the thread that notices an error condition to + * create an exception and store it to be thrown by another thread. + */ +class ExceptionHolder : public Raisable { + public: + ExceptionHolder() {} + // Use default copy & assign. + + /** Take ownership of ex */ + template ExceptionHolder(Ex* ex) { wrap(ex); } + template ExceptionHolder(const boost::shared_ptr& ex) { wrap(ex.release()); } + + template ExceptionHolder& operator=(Ex* ex) { wrap(ex); return *this; } + template ExceptionHolder& operator=(boost::shared_ptr ex) { wrap(ex.release()); return *this; } + + void raise() const { if (wrapper.get()) wrapper->raise() ; } + std::string what() const { return wrapper.get() ? wrapper->what() : std::string(); } + bool empty() const { return !wrapper.get(); } + operator bool() const { return !empty(); } + void reset() { wrapper.reset(); } + + private: + template struct Wrapper : public Raisable { + Wrapper(Ex* ptr) : exception(ptr) {} + void raise() const { throw *exception; } + std::string what() const { return exception->what(); } + boost::shared_ptr exception; + }; + template void wrap(Ex* ex) { wrapper.reset(new Wrapper(ex)); } + boost::shared_ptr wrapper; +}; + + +}} // namespace qpid::sys + + +#endif /*!QPID_EXCEPTIONHOLDER_H*/ diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index ee2acb673b..9adbbb6bf6 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -444,7 +444,6 @@ libqpidcommon_la_SOURCES += \ qpid/sys/DispatchHandle.h \ qpid/sys/Dispatcher.cpp \ qpid/sys/Dispatcher.h \ - qpid/sys/ExceptionHolder.h \ qpid/sys/FileSysDir.h \ qpid/sys/Fork.h \ qpid/sys/LockFile.h \ @@ -791,6 +790,7 @@ nobase_include_HEADERS += \ ../include/qpid/management/ManagementEvent.h \ ../include/qpid/management/ManagementObject.h \ ../include/qpid/sys/Condition.h \ + ../include/qpid/sys/ExceptionHolder.h \ ../include/qpid/sys/IOHandle.h \ ../include/qpid/sys/IntegerTypes.h \ ../include/qpid/sys/Monitor.h \ diff --git a/cpp/src/qpid/sys/ExceptionHolder.h b/cpp/src/qpid/sys/ExceptionHolder.h deleted file mode 100644 index fecaa73eea..0000000000 --- a/cpp/src/qpid/sys/ExceptionHolder.h +++ /dev/null @@ -1,75 +0,0 @@ -#ifndef QPID_EXCEPTIONHOLDER_H -#define QPID_EXCEPTIONHOLDER_H - -/* - * - * 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/memory.h" -#include - - -namespace qpid { -namespace sys { - -struct Raisable { - virtual ~Raisable() {}; - virtual void raise() const=0; - virtual std::string what() const=0; -}; - -/** - * Holder for exceptions. Allows the thread that notices an error condition to - * create an exception and store it to be thrown by another thread. - */ -class ExceptionHolder : public Raisable { - public: - ExceptionHolder() {} - // Use default copy & assign. - - /** Take ownership of ex */ - template ExceptionHolder(Ex* ex) { wrap(ex); } - template ExceptionHolder(const boost::shared_ptr& ex) { wrap(ex.release()); } - - template ExceptionHolder& operator=(Ex* ex) { wrap(ex); return *this; } - template ExceptionHolder& operator=(boost::shared_ptr ex) { wrap(ex.release()); return *this; } - - void raise() const { if (wrapper.get()) wrapper->raise() ; } - std::string what() const { return wrapper.get() ? wrapper->what() : std::string(); } - bool empty() const { return !wrapper.get(); } - operator bool() const { return !empty(); } - void reset() { wrapper.reset(); } - - private: - template struct Wrapper : public Raisable { - Wrapper(Ex* ptr) : exception(ptr) {} - void raise() const { throw *exception; } - std::string what() const { return exception->what(); } - boost::shared_ptr exception; - }; - template void wrap(Ex* ex) { wrapper.reset(new Wrapper(ex)); } - boost::shared_ptr wrapper; -}; - - -}} // namespace qpid::sys - - -#endif /*!QPID_EXCEPTIONHOLDER_H*/ -- cgit v1.2.1