summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/catch/docs/configuration.md
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/catch/docs/configuration.md')
-rw-r--r--3rdparty/catch/docs/configuration.md11
1 files changed, 10 insertions, 1 deletions
diff --git a/3rdparty/catch/docs/configuration.md b/3rdparty/catch/docs/configuration.md
index 33052190cf3..ea57e78988a 100644
--- a/3rdparty/catch/docs/configuration.md
+++ b/3rdparty/catch/docs/configuration.md
@@ -61,6 +61,8 @@ This can be useful on certain platforms that do not provide ```std::cout``` and
CATCH_CONFIG_CPP11_LONG_LONG // generates overloads for the long long type
CATCH_CONFIG_CPP11_OVERRIDE // CATCH_OVERRIDE expands to override (for virtual function implementations)
CATCH_CONFIG_CPP11_UNIQUE_PTR // Use std::unique_ptr instead of std::auto_ptr
+ CATCH_CONFIG_CPP11_SHUFFLE // Use std::shuffle instead of std::random_shuffle
+ CATCH_CONFIG_CPP11_TYPE_TRAITS // Use std::enable_if and <type_traits>
Catch has some basic compiler detection that will attempt to select the appropriate mix of these macros. However being incomplete - and often without access to the respective compilers - this detection tends to be conservative.
So overriding control is given to the user. If a compiler supports a feature (and Catch does not already detect it) then one or more of these may be defined to enable it (or suppress it, in some cases). If you do do this please raise an issue, specifying your compiler version (ideally with an idea of how to detect it) and stating that it has such support.
@@ -68,6 +70,13 @@ You may also suppress any of these features by using the `_NO_` form, e.g. `CATC
All C++11 support can be disabled with `CATCH_CONFIG_NO_CPP11`
+# Windows header clutter
+
+On Windows Catch includes `windows.h`. To minimize global namespace clutter in the implementation file, it defines `NOMINMAX` and `WIN32_LEAN_AND_MEAN` before including it. You can control this behaviour via two macros:
+
+ CATCH_CONFIG_NO_NOMINMAX // Stops Catch from using NOMINMAX macro
+ CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN // Stops Catch from using WIN32_LEAN_AND_MEAN macro
+
---
-[Home](Readme.md) \ No newline at end of file
+[Home](Readme.md)