aboutsummaryrefslogtreecommitdiff
path: root/src/common/Define.h
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2016-01-09 01:38:59 +0100
committerShauren <shauren.trinity@gmail.com>2016-01-09 01:38:59 +0100
commitbc94bacce404401a480b6871eaa7bc38d766014c (patch)
tree642fc97c2a2234fa314d19b72092b5bca848368d /src/common/Define.h
parent53f768bd2a83c5f0e2af48130eb4cbf4c2e5a028 (diff)
Core/Misc: Build fix for clang & libc++
Diffstat (limited to 'src/common/Define.h')
-rw-r--r--src/common/Define.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/common/Define.h b/src/common/Define.h
index 3fa67a832a6..061a6bc2f5e 100644
--- a/src/common/Define.h
+++ b/src/common/Define.h
@@ -83,10 +83,16 @@
# define ATTR_NORETURN __attribute__((__noreturn__))
# define ATTR_PRINTF(F, V) __attribute__ ((__format__ (__printf__, F, V)))
# define ATTR_DEPRECATED __attribute__((__deprecated__))
+# define TRINITY_CONSTEXPR constexpr
#else //COMPILER != COMPILER_GNU
# define ATTR_NORETURN
# define ATTR_PRINTF(F, V)
# define ATTR_DEPRECATED
+#if _MSC_VER >= 1900
+# define TRINITY_CONSTEXPR constexpr
+#else
+# define TRINITY_CONSTEXPR
+#endif
#endif //COMPILER == COMPILER_GNU
#define UI64FMTD "%" PRIu64