Changeset 17766 for trunk/Mars/mcore


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/mcore/zofits.h

    r17754 r17766  
    1616#ifdef HAVE_BOOST_THREAD
    1717#include <boost/thread.hpp>
     18#endif
     19
     20#if defined(__CINT__) || !defined(__EXCEPTIONS)
     21namespace std
     22{
     23    typedef void* exception_ptr;
     24};
    1825#endif
    1926
     
    991998        std::vector<char>             fRawSumBuffer;    ///< buffer used for checksuming the incoming data, before compression
    992999
    993 #ifdef __EXCEPTIONS
    9941000        std::exception_ptr fThreadsException; ///< exception pointer to store exceptions coming from the threads
    995 #endif
    9961001        int                fErrno;            ///< propagate errno to main thread
    9971002};
Note: See TracChangeset for help on using the changeset viewer.