tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-26 07:04:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Build fix for OS X.

Browse Source
This commit is contained in:
Gunnar Beutner 2014-04-22 07:13:16 +02:00
parent 6b55e7827d
commit 66faec2689
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/base/exception.cpp
View File

@ -28,14 +28,22 @@ using namespace icinga;
static boost::thread_specific_ptr<StackTrace> l_LastExceptionStack; static boost::thread_specific_ptr<StackTrace> l_LastExceptionStack;
static boost::thread_specific_ptr<ContextTrace> l_LastExceptionContext; static boost::thread_specific_ptr<ContextTrace> l_LastExceptionContext;
#ifndef _MSC_VER
# if __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ > 3)
# define TYPEINFO_TYPE std::type_info
# else
# define TYPEINFO_TYPE void
# endif
#endif /* _MSC_VER */
#if !defined(__GLIBCXX__) && !defined(_WIN32) #if !defined(__GLIBCXX__) && !defined(_WIN32)
static boost::thread_specific_ptr<void *> l_LastExceptionObj; static boost::thread_specific_ptr<void *> l_LastExceptionObj;
static boost::thread_specific_ptr<void *> l_LastExceptionPvtInfo; static boost::thread_specific_ptr<TYPEINFO_TYPE *> l_LastExceptionPvtInfo;
typedef void (*DestCallback)(void *); typedef void (*DestCallback)(void *);
static boost::thread_specific_ptr<DestCallback> l_LastExceptionDest; static boost::thread_specific_ptr<DestCallback> l_LastExceptionDest;
extern "C" void __cxa_throw(void *obj, void *pvtinfo, void (*dest)(void *)); extern "C" void __cxa_throw(void *obj, TYPEINFO_TYPE *pvtinfo, void (*dest)(void *));
extern "C" void __cxa_rethrow_primary_exception(void* thrown_object); extern "C" void __cxa_rethrow_primary_exception(void* thrown_object);
#endif /* !__GLIBCXX__ && !_WIN32 */ #endif /* !__GLIBCXX__ && !_WIN32 */
@ -49,12 +57,6 @@ void icinga::RethrowUncaughtException(void)
} }
#ifndef _MSC_VER #ifndef _MSC_VER
# if __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ > 3)
# define TYPEINFO_TYPE std::type_info
# else
# define TYPEINFO_TYPE void
# endif
extern "C" extern "C"
void __cxa_throw(void *obj, TYPEINFO_TYPE *pvtinfo, void (*dest)(void *)) void __cxa_throw(void *obj, TYPEINFO_TYPE *pvtinfo, void (*dest)(void *))
{ {
@ -65,7 +67,7 @@ void __cxa_throw(void *obj, TYPEINFO_TYPE *pvtinfo, void (*dest)(void *))
#ifndef __GLIBCXX__ #ifndef __GLIBCXX__
l_LastExceptionObj.reset(new void *(obj)); l_LastExceptionObj.reset(new void *(obj));
l_LastExceptionPvtInfo.reset(new void *(pvtinfo)); l_LastExceptionPvtInfo.reset(new TYPEINFO_TYPE *(pvtinfo));
l_LastExceptionDest.reset(new DestCallback(dest)); l_LastExceptionDest.reset(new DestCallback(dest));
#endif /* __GLIBCXX__ */ #endif /* __GLIBCXX__ */