Changeset 17766 for trunk/Mars

Timestamp:

05/02/14 16:21:03 (11 years ago)

Author:

tbretz

Message:

Removing the std::exception_ptr by an ifdef is dangerous, because CINT will never set that define... therefore, make sure the correct size is always there.

File:

• trunk/Mars/mcore/zofits.h (modified) (2 diffs)

trunk/Mars/mcore/zofits.h

@@ -16 +16 @@
 #ifdef HAVE_BOOST_THREAD
 #include <boost/thread.hpp>
+#endif
+
+#if defined(__CINT__) || !defined(__EXCEPTIONS)
+namespace std
+{
+    typedef void* exception_ptr;
+};
 #endif
 
@@ -991 +998 @@
         std::vector<char>             fRawSumBuffer;    ///< buffer used for checksuming the incoming data, before compression
 
-#ifdef __EXCEPTIONS
         std::exception_ptr fThreadsException; ///< exception pointer to store exceptions coming from the threads
-#endif
         int                fErrno;            ///< propagate errno to main thread
 };