File tree Expand file tree Collapse file tree 2 files changed +19
-2
lines changed Expand file tree Collapse file tree 2 files changed +19
-2
lines changed Original file line number Diff line number Diff line change 22#ifndef _INC_CPUID
33#define _INC_CPUID
44
5+ #ifndef xrCoreH
6+ // If xrCore.h is not included then compilation fails
7+ // This fixes it.
8+ // XXX: Find a better solution
9+ #ifdef NDEBUG
10+ #define XR_NOEXCEPT throw()
11+ #else
12+ #define XR_NOEXCEPT noexcept
13+ #endif
14+ #endif
15+
516enum class CpuFeature : u32
617{
718 Mmx = 0x0001 ,
@@ -36,9 +47,9 @@ struct processor_info
3647 // except 2nd (and upper) logical threads
3748 // of the same physical core
3849
39- bool hasFeature (const CpuFeature feature ) const noexcept
50+ bool hasFeature (const CpuFeature feature ) const XR_NOEXCEPT
4051 {
41- return features & static_cast < u32 > (feature );
52+ return ( features & static_cast < u32 > (feature )) != 0 ;
4253 }
4354};
4455
Original file line number Diff line number Diff line change 3131#if !defined(_CPPUNWIND)
3232#error Please enable exceptions...
3333#endif
34+
3435#ifndef _MT
3536#error Please enable multi-threaded library...
3637#endif
38+
3739#ifdef NDEBUG
3840#define XRAY_EXCEPTIONS 0
3941#define LUABIND_NO_EXCEPTIONS
42+ #define XR_NOEXCEPT throw ()
43+ #define XR_NOEXCEPT_OP (x )
4044#else
4145#define XRAY_EXCEPTIONS 1
46+ #define XR_NOEXCEPT noexcept
47+ #define XR_NOEXCEPT_OP (x ) noexcept (x)
4248#endif
4349
4450#include " Common/Platform.hpp"
You can’t perform that action at this time.
0 commit comments