A couple fixes
This commit is contained in:
parent
728ec2cb40
commit
e7aae33cec
@ -27,7 +27,7 @@
|
|||||||
#define CPPTRACE_FORCE_NO_INLINE __attribute__((noinline))
|
#define CPPTRACE_FORCE_NO_INLINE __attribute__((noinline))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma warning(push)
|
#pragma warning(push)
|
||||||
// warning C4251: using non-dll-exported type in dll-exported type, firing on std::vector<frame_ptr> and others for some
|
// warning C4251: using non-dll-exported type in dll-exported type, firing on std::vector<frame_ptr> and others for some
|
||||||
// reason
|
// reason
|
||||||
@ -406,7 +406,7 @@ namespace cpptrace {
|
|||||||
} catch(...) { \
|
} catch(...) { \
|
||||||
::cpptrace::rethrow_and_wrap_if_needed(); \
|
::cpptrace::rethrow_and_wrap_if_needed(); \
|
||||||
} \
|
} \
|
||||||
} while(0);
|
} while(0)
|
||||||
|
|
||||||
#define CPPTRACE_WRAP(expression) [&] () -> decltype((expression)) { \
|
#define CPPTRACE_WRAP(expression) [&] () -> decltype((expression)) { \
|
||||||
try { \
|
try { \
|
||||||
@ -416,7 +416,7 @@ namespace cpptrace {
|
|||||||
} \
|
} \
|
||||||
} ()
|
} ()
|
||||||
|
|
||||||
#if _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma warning(pop)
|
#pragma warning(pop)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user