Rename override macros to use variant_CONFIG_OVERRIDE_*, move-up override sections

variant_CONFIG_OVERRIDE_MONOSTATE
variant_CONFIG_OVERRIDE_BAD_VARIANT_ACCESS

Author: martinmoene

README.md

@@ -215,6 +215,26 @@ At default, *variant lite* uses `std::variant` if it is available and lets you u
 -D<b>variant\_CONFIG\_SELECT\_VARIANT</b>=variant_VARIANT_DEFAULT  
 Define this to `variant_VARIANT_STD` to select `std::variant` as `nonstd::variant`. Define this to `variant_VARIANT_NONSTD` to select `nonstd::variant` as `nonstd::variant`. Default is undefined, which has the same effect as defining to `variant_VARIANT_DEFAULT`.
 
+#### Override `bad_variant_access`
+
+\-D<b>variant_CONFIG_OVERRIDE_BAD_VARIANT_ACCESS</b>=type 
+
+Define this macro to override the default definition of `bad_variant_access`. This is useful when integrating with other compatibility libraries or the standard library to avoid conflicting exception types.
+
+For example: `#define variant_CONFIG_OVERRIDE_BAD_VARIANT_ACCESS std::bad_variant_access`
+
+If not defined, variant-lite uses its own `nonstd::bad_variant_access`.
+
+#### Override `monostate`
+
+\-D<b>variant_CONFIG_OVERRIDE_MONOSTATE</b>=type 
+
+Define this macro to override the default `monostate` type used by variant-lite. This helps prevent type conflicts when multiple libraries define their own monostate. 
+
+For example: `#define variant_CONFIG_OVERRIDE_MONOSTATE std::monostate`
+
+If not defined, variant-lite uses its own `nonstd::monostate`.
+
 #### Disable exceptions
 
 -D<b>variant_CONFIG_NO_EXCEPTIONS</b>=0  
@@ -248,32 +268,6 @@ Define this to the pod-type you want to align to (no default).
 \-D<b>variant\_CONFIG\_ALIGN\_AS\_FALLBACK</b>=*pod_type*  
 Define this to the pod-type to use for alignment if the algorithm of *variant lite* cannot find a suitable POD type to use for alignment. Default is `double`.
 
-#### Override `bad_variant_access`
-<b>variant_CONFIG_BAD_VARIANT_ACCESS</b>=type 
-
-Define this macro to override the default definition of `bad_variant_access`. 
-
-This is useful when integrating with other compatibility libraries or the standard library to avoid conflicting exception types. 
-
-Example:
-```cpp
-#define variant_CONFIG_BAD_VARIANT_ACCESS std::bad_variant_access
-```
-If not defined, variant-lite uses its own `nonstd::bad_variant_access`.
-
-#### Override `monostate`
-<b>variant_CONFIG_MONOSTATE</b>=type 
-
-Define this macro to override the default `monostate` type used by variant-lite. 
-
-This helps prevent type conflicts when multiple libraries define their own monostate. 
-
-Example:
-```cpp
-#define variant_CONFIG_MONOSTATE std::monostate
-```
-If not defined, variant-lite uses its own `nonstd::monostate`.
-
 ## Reported to work with
 
 The table below mentions the compiler versions *variant lite* is reported to work with.

include/nonstd/variant.hpp

@@ -1212,9 +1212,9 @@ class variant;
 
 // 19.7.8 Class monostate
 
-#ifdef variant_CONFIG_MONOSTATE
+#ifdef variant_CONFIG_OVERRIDE_MONOSTATE
 
-using variant_CONFIG_MONOSTATE;
+using variant_CONFIG_OVERRIDE_MONOSTATE;
 
 #else
 
@@ -1228,7 +1228,7 @@ inline variant_constexpr bool operator>=( monostate, monostate ) variant_noexcep
 inline variant_constexpr bool operator==( monostate, monostate ) variant_noexcept { return true;  }
 inline variant_constexpr bool operator!=( monostate, monostate ) variant_noexcept { return false; }
 
-#endif // variant_CONFIG_MONOSTATE
+#endif // variant_CONFIG_OVERRIDE_MONOSTATE
 
 // 19.7.4 variant helper classes
 
@@ -1287,8 +1287,8 @@ static const std::size_t variant_npos = static_cast<std::size_t>( -1 );
 
 // 19.7.11 Class bad_variant_access
 
-#ifdef variant_CONFIG_BAD_VARIANT_ACCESS
-using variant_CONFIG_BAD_VARIANT_ACCESS;
+#ifdef variant_CONFIG_OVERRIDE_BAD_VARIANT_ACCESS
+using variant_CONFIG_OVERRIDE_BAD_VARIANT_ACCESS;
 #else
 class variant_nodiscard bad_variant_access : public std::exception
 {
@@ -1302,7 +1302,7 @@ class variant_nodiscard bad_variant_access : public std::exception
         return "bad variant access";
     }
 };
-#endif // variant_CONFIG_BAD_VARIANT_ACCESS
+#endif // variant_CONFIG_OVERRIDE_BAD_VARIANT_ACCESS
 
 #endif // variant_CONFIG_NO_EXCEPTIONS
 
@@ -2715,7 +2715,7 @@ using namespace variants;
 
 namespace std {
 
-#ifndef variant_CONFIG_MONOSTATE
+#ifndef variant_CONFIG_OVERRIDE_MONOSTATE
 
 template<>
 struct hash< nonstd::monostate >
@@ -2726,7 +2726,7 @@ struct hash< nonstd::monostate >
     }
 };
 
-#endif // variant_CONFIG_MONOSTATE
+#endif // variant_CONFIG_OVERRIDE_MONOSTATE
 
 template< class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8, class T9, class T10, class T11, class T12, class T13, class T14, class T15 >
 struct hash< nonstd::variant<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> >

template/variant.hpp

@@ -1087,9 +1087,9 @@ class variant;
 
 // 19.7.8 Class monostate
 
-#ifdef variant_CONFIG_MONOSTATE
+#ifdef variant_CONFIG_OVERRIDE_MONOSTATE
 
-using variant_CONFIG_MONOSTATE;
+using variant_CONFIG_OVERRIDE_MONOSTATE;
 
 #else
 
@@ -1103,7 +1103,7 @@ inline variant_constexpr bool operator>=( monostate, monostate ) variant_noexcep
 inline variant_constexpr bool operator==( monostate, monostate ) variant_noexcept { return true;  }
 inline variant_constexpr bool operator!=( monostate, monostate ) variant_noexcept { return false; }
 
-#endif // variant_CONFIG_MONOSTATE
+#endif // variant_CONFIG_OVERRIDE_MONOSTATE
 
 // 19.7.4 variant helper classes
 
@@ -1162,8 +1162,8 @@ static const std::size_t variant_npos = static_cast<std::size_t>( -1 );
 
 // 19.7.11 Class bad_variant_access
 
-#ifdef variant_CONFIG_BAD_VARIANT_ACCESS
-using variant_CONFIG_BAD_VARIANT_ACCESS;
+#ifdef variant_CONFIG_OVERRIDE_BAD_VARIANT_ACCESS
+using variant_CONFIG_OVERRIDE_BAD_VARIANT_ACCESS;
 #else
 class variant_nodiscard bad_variant_access : public std::exception
 {
@@ -1177,7 +1177,7 @@ class variant_nodiscard bad_variant_access : public std::exception
         return "bad variant access";
     }
 };
-#endif // variant_CONFIG_BAD_VARIANT_ACCESS
+#endif // variant_CONFIG_OVERRIDE_BAD_VARIANT_ACCESS
 
 #endif // variant_CONFIG_NO_EXCEPTIONS
 
@@ -2060,7 +2060,7 @@ using namespace variants;
 
 namespace std {
 
-#ifndef variant_CONFIG_MONOSTATE
+#ifndef variant_CONFIG_OVERRIDE_MONOSTATE
 
 template<>
 struct hash< nonstd::monostate >
@@ -2071,7 +2071,7 @@ struct hash< nonstd::monostate >
     }
 };
 
-#endif // variant_CONFIG_MONOSTATE
+#endif // variant_CONFIG_OVERRIDE_MONOSTATE
 
 template< {{TplParamsList}} >
 struct hash< nonstd::variant<{{TplArgsList}}> >