Skip to content

Commit a1d4c52

Browse files
committed
Move XR_NOEXCEPT macro to Compiler.inl
1 parent 3043700 commit a1d4c52

File tree

3 files changed

+8
-15
lines changed

3 files changed

+8
-15
lines changed

src/Common/Compiler.inl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,11 @@
2323
#endif
2424

2525
#define UNUSED(...) (void)(__VA_ARGS__)
26+
27+
#ifndef _CPPUNWIND//def NDEBUG
28+
#define XR_NOEXCEPT throw()
29+
#define XR_NOEXCEPT_OP(x)
30+
#else
31+
#define XR_NOEXCEPT noexcept
32+
#define XR_NOEXCEPT_OP(x) noexcept(x)
33+
#endif

src/xrCore/cpuid.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,6 @@
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-
165
enum class CpuFeature : u32
176
{
187
Mmx = 0x0001,

src/xrCore/xrCore.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,8 @@
3535
#ifdef NDEBUG
3636
#define XRAY_EXCEPTIONS 0
3737
#define LUABIND_NO_EXCEPTIONS
38-
#define XR_NOEXCEPT throw()
39-
#define XR_NOEXCEPT_OP(x)
4038
#else
4139
#define XRAY_EXCEPTIONS 1
42-
#define XR_NOEXCEPT noexcept
43-
#define XR_NOEXCEPT_OP(x) noexcept(x)
4440
#endif
4541

4642
#if !defined(DEBUG) && (defined(_DEBUG) || defined(MIXED))

0 commit comments

Comments
 (0)