summaryrefslogtreecommitdiff
path: root/Rx/v2/src/rxcpp/rx-includes.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'Rx/v2/src/rxcpp/rx-includes.hpp')
-rw-r--r--Rx/v2/src/rxcpp/rx-includes.hpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/Rx/v2/src/rxcpp/rx-includes.hpp b/Rx/v2/src/rxcpp/rx-includes.hpp
index 5104565..1f5c5e4 100644
--- a/Rx/v2/src/rxcpp/rx-includes.hpp
+++ b/Rx/v2/src/rxcpp/rx-includes.hpp
@@ -23,6 +23,10 @@
#define RXCPP_USE_RTTI 1
#endif
+#if _HAS_EXCEPTIONS
+#define RXCPP_USE_EXCEPTIONS 1
+#endif
+
#elif defined(__clang__)
#if __has_feature(cxx_rvalue_references)
@@ -34,6 +38,9 @@
#if __has_feature(cxx_variadic_templates)
#define RXCPP_USE_VARIADIC_TEMPLATES 1
#endif
+#if __has_feature(cxx_exceptions)
+#define RXCPP_USE_EXCEPTIONS 1
+#endif
#elif defined(__GNUG__)
@@ -53,6 +60,10 @@
#define RXCPP_USE_RTTI 1
#endif
+#if defined(__EXCEPTIONS)
+#define RXCPP_USE_EXCEPTIONS 1
+#endif
+
#endif
//
@@ -95,6 +106,11 @@
#define RXCPP_USE_RTTI RXCPP_FORCE_USE_RTTI
#endif
+#if defined(RXCPP_FORCE_USE_EXCEPTIONS)
+#undef RXCPP_USE_EXCEPTIONS
+#define RXCPP_USE_EXCEPTIONS RXCPP_FORCE_USE_EXCEPTIONS
+#endif
+
#if defined(RXCPP_FORCE_USE_WINRT)
#undef RXCPP_USE_WINRT
#define RXCPP_USE_WINRT RXCPP_FORCE_USE_WINRT