improved support for __fp16, _Float16 and __float128

also:
- fixed a bunch of doxygen parsing issues
- added `#define` leak detection to the single-header script
- renamed `TOML_ALL_INLINE` to `TOML_HEADER_ONLY` (the old one still works too)
- simplified abi namespace definitions

README.md

@@ -115,12 +115,12 @@ won't need to mess with these at all, but if you do, set them before including t
 
 | Option                     |      Type      | Default                           | Description                                                                                                          |
 |----------------------------|:--------------:|-----------------------------------|----------------------------------------------------------------------------------------------------------------------|
-| `TOML_ALL_INLINE`          |     boolean    | `1`                               | Disable this to explicitly control where toml++'s implementation is compiled (e.g. as part of a library).            |
+| `TOML_HEADER_ONLY`          |     boolean    | `1`                               | Disable this to explicitly control where toml++'s implementation is compiled (e.g. as part of a library).            |
 | `TOML_API`                 |     define     | undefined                         | API annotation to add to public symbols (e.g. `__declspec(dllexport)` on Windows).                                   |
 | `TOML_ASSERT(expr)`        | function macro | `assert(expr)`<br>(or undefined)  | Sets the assert function used by the library.                                                                        |
 | `TOML_CONFIG_HEADER`       | string literal | undefined                         | Includes the given header file before the rest of the library.                                                       |
 | `TOML_EXCEPTIONS`          |     boolean    | per your compiler's settings      | Sets whether the library uses exceptions.                                                                            |
-| `TOML_IMPLEMENTATION`      |     define     | undefined                         | Define this to enable compilation of the library's implementation. Meaningless if `TOML_ALL_INLINE` is `1`.          |
+| `TOML_IMPLEMENTATION`      |     define     | undefined                         | Define this to enable compilation of the library's implementation. Meaningless if `TOML_HEADER_ONLY` is `1`.          |
 | `TOML_LARGE_FILES`         |     boolean    | `0`                               | Uses 32-bit integers for line and column indices (instead of 16-bit).                                                |
 | `TOML_OPTIONAL_TYPE`       |    type name   | undefined                         | Overrides the `optional<T>` type used by the library if you need [something better than std::optional].              |
 | `TOML_PARSER`              |     boolean    | `1`                               | Disable this to prevent inclusion of the parser-related parts of the library if you don't need them.                 |

docs/Doxyfile

@@ -309,32 +309,49 @@ EXPAND_ONLY_PREDEF     = NO
 SEARCH_INCLUDES        = NO
 INCLUDE_PATH           =
 INCLUDE_FILE_PATTERNS  =
-PREDEFINED             = DOXYGEN=1 \
-                         NDEBUG=1 \
-                         __cplusplus=201703L \
-                         __has_include(x)=0 \
-                         __has_attribute(x)=0 \
-                         __cpp_lib_char8_t=201811L \
-                         TOML_ALWAYS_INLINE=inline \
-                         TOML_MAY_THROW= \
-                         TOML_NODISCARD_CTOR= \
-                         TOML_EXTERNAL_LINKAGE= \
-                         TOML_API= \
-                         TOML_ABI_NAMESPACE_START(...)= \
-                         TOML_ABI_NAMESPACE_BOOL(...)= \
-                         TOML_ABI_NAMESPACE_END= \
-                         TOML_ATTR(...)=	\
-                         TOML_PUSH_WARNINGS= \ 
-                         TOML_DISABLE_SWITCH_WARNINGS= \
-                         TOML_DISABLE_INIT_WARNINGS= \
-                         TOML_DISABLE_MISC_WARNINGS= \
-                         TOML_DISABLE_PADDING_WARNINGS= \
-                         TOML_DISABLE_ARITHMETIC_WARNINGS= \
-                         TOML_DISABLE_SHADOW_WARNINGS= \
-                         TOML_DISABLE_SUGGEST_WARNINGS= \
-                         TOML_DISABLE_ALL_WARNINGS= \
-                         TOML_POP_WARNINGS= \
-                         TOML_ASYMMETRICAL_EQUALITY_OPS(...)=
+PREDEFINED             =                                           \
+    "DOXYGEN=1"                                                    \
+    "NDEBUG=1"                                                     \
+    "__cplusplus=201703L"                                          \
+    "__has_include(...)=0"                                         \
+    "__has_attribute(...)=0"                                       \
+    "__cpp_lib_char8_t=201811L"                                    \
+    "TOML_DISABLE_ENVIRONMENT_CHECKS="                             \
+    "TOML_ALWAYS_INLINE=inline"                                    \
+    "TOML_MAY_THROW="                                              \
+    "TOML_NODISCARD_CTOR="                                         \
+    "TOML_EXTERNAL_LINKAGE="                                       \
+    "TOML_API="                                                    \
+    "TOML_ATTR(...)="                                              \
+    "TOML_PUSH_WARNINGS="                                          \
+    "TOML_DISABLE_SWITCH_WARNINGS="                                \
+    "TOML_DISABLE_INIT_WARNINGS="                                  \
+    "TOML_DISABLE_MISC_WARNINGS="                                  \
+    "TOML_DISABLE_PADDING_WARNINGS="                               \
+    "TOML_DISABLE_ARITHMETIC_WARNINGS="                            \
+    "TOML_DISABLE_SHADOW_WARNINGS="                                \
+    "TOML_DISABLE_SUGGEST_WARNINGS="                               \
+    "TOML_DISABLE_ALL_WARNINGS="                                   \
+    "TOML_POP_WARNINGS="                                           \
+    "TOML_ASYMMETRICAL_EQUALITY_OPS(...)="                         \
+    "TOML_NAMESPACE_START=namespace toml"                          \
+    "TOML_NAMESPACE_END="                                          \
+    "TOML_NAMESPACE=toml"                                          \
+    "TOML_ABI_NAMESPACE_START(...)="                               \
+    "TOML_ABI_NAMESPACE_BOOL(...)="                                \
+    "TOML_ABI_NAMESPACE_END="                                      \
+    "TOML_IMPL_NAMESPACE_START=namespace toml { namespace impl"    \
+    "TOML_IMPL_NAMESPACE_END=} }"                                  \
+    "TOML_ANON_NAMESPACE_START=namespace"                          \
+    "TOML_ANON_NAMESPACE_END="                                     \
+    "TOML_ANON_NAMESPACE="                                         \
+    "TOML_USING_ANON_NAMESPACE=(void)0"                            \
+    "TOML_EXTERNAL_LINKAGE="                                       \
+    "TOML_TRIVIAL_ABI="                                            \
+    "TOML_EMPTY_BASES="                                            \
+    "TOML_INTERFACE"                                               \
+    "TOML_SIMPLE_STATIC_ASSERT_MESSAGES=1"                         \
+    "TOML_INTERNAL_LINKAGE=static"
 EXPAND_AS_DEFINED      = 
 SKIP_FUNCTION_MACROS   = NO
 #---------------------------------------------------------------------------

docs/main_page.dox

@@ -59,7 +59,7 @@
 /// \m_class{m-note m-warning}
 /// 
 /// \parblock
-/// <h3>Don't forget [code]#include &lt;fstream&gt;[/code]!</h3>
+/// <h3>Don't forget [code]\#include &lt;fstream&gt;[/code]!</h3>
 /// Not everyone who uses the library is going to work directly from files, so not everybody is forced to pay
 /// the compilation overhead of including `<fstream>`. You need to explicitly include it if you're going to be calling
 /// toml::parse_file().
@@ -383,14 +383,14 @@
 /// a large number of translation units. You can counter this by disabling 'all inline' mode and explicitly controlling
 /// where the library's implementation is compiled.
 /// 
-/// <strong>Step 1: Set \ref TOML_ALL_INLINE to [code]0[/code] before including toml++</strong>
+/// <strong>Step 1: Set \ref TOML_HEADER_ONLY to [code]0[/code] before including toml++</strong>
 /// 
 /// This must be the same everywhere, so either set it as a global `#define` in your build system, or
 /// do it manually before including toml++ in some global header that's used everywhere in your project:
 /// \cpp
 /// // global_header_that_includes_toml++.h
 /// 
-/// #define TOML_ALL_INLINE 0
+/// #define TOML_HEADER_ONLY 0
 /// #include <toml.hpp>
 /// \ecpp
 /// 

examples/utf8_console.h

@@ -8,11 +8,11 @@
 #include <Windows.h>
 #endif
 
-	inline void init_utf8_console() noexcept
-	{
-		#ifdef _WIN32
-		SetConsoleOutputCP(65001); //CP_UTF8
-		#endif
+inline void init_utf8_console() noexcept
+{
+	#ifdef _WIN32
+	SetConsoleOutputCP(65001); //CP_UTF8
+	#endif
 
-		std::cout << std::boolalpha;
-	}
+	std::cout << std::boolalpha;
+}

include/toml++/toml.h

@@ -43,81 +43,96 @@
 	#include "toml_parser.hpp"
 #endif // TOML_PARSER
 
-#if !TOML_ALL_INLINE
+#if !TOML_HEADER_ONLY
 	#include "toml_instantiations.hpp"
-#endif // !TOML_ALL_INLINE
+#endif // !TOML_HEADER_ONLY
 
 #endif // TOML_IMPLEMENTATION
 
 // macro hygiene
 #if TOML_UNDEF_MACROS
-	#undef TOML_INT_CHARCONV
-	#undef TOML_FLOAT_CHARCONV
+	#undef TOML_ABI_NAMESPACES
+	#undef TOML_ABI_NAMESPACE_BOOL
+	#undef TOML_ABI_NAMESPACE_END
+	#undef TOML_ABI_NAMESPACE_START
+	#undef TOML_ALWAYS_INLINE
+	#undef TOML_ANON_NAMESPACE
+	#undef TOML_ANON_NAMESPACE_END
+	#undef TOML_ANON_NAMESPACE_START
+	#undef TOML_ARM
+	#undef TOML_ASSERT
+	#undef TOML_ASSUME
+	#undef TOML_ASYMMETRICAL_EQUALITY_OPS
 	#undef TOML_ATTR
-	#undef TOML_PUSH_WARNINGS
-	#undef TOML_DISABLE_SWITCH_WARNINGS
+	#undef TOML_CLANG
+	#undef TOML_COMPILER_EXCEPTIONS
+	#undef TOML_CONCAT
+	#undef TOML_CONCAT_1
+	#undef TOML_CONSTEVAL
+	#undef TOML_CPP
+	#undef TOML_DISABLE_ALL_WARNINGS
+	#undef TOML_DISABLE_ARITHMETIC_WARNINGS
 	#undef TOML_DISABLE_INIT_WARNINGS
 	#undef TOML_DISABLE_MISC_WARNINGS
 	#undef TOML_DISABLE_PADDING_WARNINGS
-	#undef TOML_DISABLE_ARITHMETIC_WARNINGS
 	#undef TOML_DISABLE_SHADOW_WARNINGS
 	#undef TOML_DISABLE_SUGGEST_WARNINGS
-	#undef TOML_DISABLE_ALL_WARNINGS
-	#undef TOML_POP_WARNINGS
-	#undef TOML_ALWAYS_INLINE
-	#undef TOML_NEVER_INLINE
-	#undef TOML_ASSUME
-	#undef TOML_UNREACHABLE
-	#undef TOML_INTERFACE
+	#undef TOML_DISABLE_SWITCH_WARNINGS
 	#undef TOML_EMPTY_BASES
-	#undef TOML_CPP
-	#undef TOML_MAY_THROW
-	#undef TOML_NO_DEFAULT_CASE
-	#undef TOML_CONSTEVAL
-	#undef TOML_LIKELY
-	#undef TOML_UNLIKELY
-	#undef TOML_NODISCARD_CTOR
-	#undef TOML_MAKE_VERSION
+	#undef TOML_EVAL_BOOL_0
+	#undef TOML_EVAL_BOOL_1
+	#undef TOML_EXTERNAL_LINKAGE
+	#undef TOML_FLOAT128
+	#undef TOML_FLOAT16
+	#undef TOML_FLOAT_CHARCONV
+	#undef TOML_FP16
+	#undef TOML_GCC
+	#undef TOML_HAS_CUSTOM_OPTIONAL_TYPE
+	#undef TOML_HAS_INCLUDE
+	#undef TOML_ICC
+	#undef TOML_IMPLEMENTATION
+	#undef TOML_IMPL_NAMESPACE_END
+	#undef TOML_IMPL_NAMESPACE_START
+	#undef TOML_INT128
+	#undef TOML_INTELLISENSE
+	#undef TOML_INTERFACE
+	#undef TOML_INTERNAL_LINKAGE
+	#undef TOML_INT_CHARCONV
+	#undef TOML_LANG_AT_LEAST
 	#undef TOML_LANG_EFFECTIVE_VERSION
 	#undef TOML_LANG_HIGHER_THAN
-	#undef TOML_LANG_AT_LEAST
 	#undef TOML_LANG_UNRELEASED
-	#undef TOML_UNDEF_MACROS
-	#undef TOML_RELOPS_REORDERING
-	#undef TOML_ASYMMETRICAL_EQUALITY_OPS
-	#undef TOML_ALL_INLINE
-	#undef TOML_IMPLEMENTATION
-	#undef TOML_EXTERNAL_LINKAGE
-	#undef TOML_INTERNAL_LINKAGE
-	#undef TOML_ANONYMOUS_NAMESPACE
-	#undef TOML_ANONYMOUS_NAMESPACE_END
-	#undef TOML_COMPILER_EXCEPTIONS
-	#undef TOML_TRIVIAL_ABI
-	#undef TOML_ABI_NAMESPACES
-	#undef TOML_ABI_NAMESPACE_START
-	#undef TOML_ABI_NAMESPACE_VERSION
-	#undef TOML_ABI_NAMESPACE_BOOL
-	#undef TOML_ABI_NAMESPACE_END
-	#undef TOML_PARSER_TYPENAME
 	#undef TOML_LAUNDER
-	#undef TOML_CONCAT_1
-	#undef TOML_CONCAT
-	#undef TOML_EVAL_BOOL_1
-	#undef TOML_EVAL_BOOL_0
-	#undef TOML_HAS_CUSTOM_OPTIONAL_TYPE
-	#undef TOML_IMPL_NAMESPACE_START
-	#undef TOML_IMPL_NAMESPACE_END
-	#undef TOML_SIMPLE_STATIC_ASSERT_MESSAGES
-	#undef TOML_SA_NEWLINE
-	#undef TOML_SA_LIST_SEP
+	#undef TOML_LIKELY
+	#undef TOML_MAKE_VERSION
+	#undef TOML_MAY_THROW
+	#undef TOML_MSVC
+	#undef TOML_NAMESPACE
+	#undef TOML_NAMESPACE_END
+	#undef TOML_NAMESPACE_START
+	#undef TOML_NEVER_INLINE
+	#undef TOML_NODISCARD_CTOR
+	#undef TOML_NO_DEFAULT_CASE
+	#undef TOML_PARSER_TYPENAME
+	#undef TOML_POP_WARNINGS
+	#undef TOML_PUSH_WARNINGS
+	#undef TOML_RELOPS_REORDERING
 	#undef TOML_SA_LIST_BEG
+	#undef TOML_SA_LIST_CAP
 	#undef TOML_SA_LIST_END
 	#undef TOML_SA_LIST_NEW
 	#undef TOML_SA_LIST_NXT
-	#undef TOML_SA_LIST_CAP
+	#undef TOML_SA_LIST_SEP
 	#undef TOML_SA_NATIVE_VALUE_TYPE_LIST
+	#undef TOML_SA_NEWLINE
 	#undef TOML_SA_NODE_TYPE_LIST
 	#undef TOML_SA_UNWRAPPED_NODE_TYPE_LIST
+	#undef TOML_SIMPLE_STATIC_ASSERT_MESSAGES
+	#undef TOML_TRIVIAL_ABI
+	#undef TOML_UINT128
+	#undef TOML_UNLIKELY
+	#undef TOML_UNREACHABLE
+	#undef TOML_USING_ANON_NAMESPACE
 #endif
 
 //# {{

include/toml++/toml_array.h

@@ -9,10 +9,8 @@
 TOML_PUSH_WARNINGS
 TOML_DISABLE_MISC_WARNINGS
 
-namespace toml
+TOML_IMPL_NAMESPACE_START
 {
-	TOML_IMPL_NAMESPACE_START
-
 	template <bool IsConst>
 	class TOML_TRIVIAL_ABI array_iterator final
 	{
@@ -222,19 +220,11 @@ namespace toml
 	{
 		return make_node(std::move(val.value));
 	}
-
-	TOML_IMPL_NAMESPACE_END
 }
+TOML_IMPL_NAMESPACE_END
 
-namespace toml
+TOML_NAMESPACE_START
 {
-	TOML_ABI_NAMESPACE_VERSION
-
-	[[nodiscard]] TOML_API bool operator == (const array& lhs, const array& rhs) noexcept;
-	[[nodiscard]] TOML_API bool operator != (const array& lhs, const array& rhs) noexcept;
-	template <typename Char>
-	std::basic_ostream<Char>& operator << (std::basic_ostream<Char>&, const array&);
-
 	/// \brief A RandomAccessIterator for iterating over nodes in a toml::array.
 	using array_iterator = impl::array_iterator<false>;
 
@@ -997,8 +987,7 @@ namespace toml
 			template <typename Char>
 			friend std::basic_ostream<Char>& operator << (std::basic_ostream<Char>&, const array&);
 	};
-
-	TOML_ABI_NAMESPACE_END // version
 }
+TOML_NAMESPACE_END
 
 TOML_POP_WARNINGS //TOML_DISABLE_MISC_WARNINGS

include/toml++/toml_array.hpp

@@ -17,10 +17,8 @@ TOML_PUSH_WARNINGS
 TOML_DISABLE_SUGGEST_WARNINGS
 TOML_DISABLE_PADDING_WARNINGS
 
-namespace toml
+TOML_NAMESPACE_START
 {
-	TOML_ABI_NAMESPACE_VERSION
-
 	TOML_EXTERNAL_LINKAGE
 	void array::preinsertion_resize(size_t idx, size_t count) noexcept
 	{
@@ -257,9 +255,8 @@ namespace toml
 	{
 		return is_homogeneous(node_type::table);
 	}
-
-	TOML_ABI_NAMESPACE_END // version
 }
+TOML_NAMESPACE_END
 
 TOML_POP_WARNINGS // TOML_DISABLE_SUGGEST_WARNINGS, TOML_DISABLE_PADDING_WARNINGS
 

include/toml++/toml_date_time.h

@@ -9,10 +9,8 @@
 TOML_PUSH_WARNINGS
 TOML_DISABLE_PADDING_WARNINGS
 
-namespace toml
+TOML_NAMESPACE_START
 {
-	TOML_ABI_NAMESPACE_VERSION
-
 	/// \brief	A local date.
 	struct TOML_TRIVIAL_ABI date
 	{
@@ -97,7 +95,7 @@ namespace toml
 		return lhs;
 	}
 
-	#if !TOML_ALL_INLINE
+	#if !defined(DOXYGEN) && !TOML_HEADER_ONLY
 		extern template TOML_API std::ostream& operator << (std::ostream&, const date&);
 	#endif
 
@@ -190,7 +188,7 @@ namespace toml
 		return lhs;
 	}
 
-	#if !TOML_ALL_INLINE
+	#if !defined(DOXYGEN) && !TOML_HEADER_ONLY
 		extern template TOML_API std::ostream& operator << (std::ostream&, const time&);
 	#endif
 
@@ -296,7 +294,7 @@ namespace toml
 		return lhs;
 	}
 
-	#if !TOML_ALL_INLINE
+	#if !defined(DOXYGEN) && !TOML_HEADER_ONLY
 		extern template TOML_API std::ostream& operator << (std::ostream&, const time_offset&);
 	#endif
 
@@ -424,11 +422,10 @@ namespace toml
 		return lhs;
 	}
 
-	#if !TOML_ALL_INLINE
+	#if !defined(DOXYGEN) && !TOML_HEADER_ONLY
 		extern template TOML_API std::ostream& operator << (std::ostream&, const date_time&);
 	#endif
-
-	TOML_ABI_NAMESPACE_END // version
 }
+TOML_NAMESPACE_END
 
 TOML_POP_WARNINGS // TOML_DISABLE_PADDING_WARNINGS

include/toml++/toml_default_formatter.h

@@ -13,26 +13,16 @@ TOML_PUSH_WARNINGS
 TOML_DISABLE_SWITCH_WARNINGS
 TOML_DISABLE_PADDING_WARNINGS
 
-namespace toml
+TOML_IMPL_NAMESPACE_START
 {
-	TOML_IMPL_NAMESPACE_START
-
 	[[nodiscard]] TOML_API std::string default_formatter_make_key_segment(const std::string&) noexcept;
 	[[nodiscard]] TOML_API size_t default_formatter_inline_columns(const node&) noexcept;
 	[[nodiscard]] TOML_API bool default_formatter_forces_multiline(const node&, size_t = 0) noexcept;
-
-	TOML_IMPL_NAMESPACE_END
 }
+TOML_IMPL_NAMESPACE_END
 
-namespace toml
+TOML_NAMESPACE_START
 {
-	TOML_ABI_NAMESPACE_VERSION
-
-	template <typename T, typename U>
-	std::basic_ostream<T>& operator << (std::basic_ostream<T>&, default_formatter<U>&);
-	template <typename T, typename U>
-	std::basic_ostream<T>& operator << (std::basic_ostream<T>&, default_formatter<U>&&);
-
 	/// \brief	A wrapper for printing TOML objects out to a stream as formatted TOML.
 	/// 
 	/// \remarks You generally don't need to create an instance of this class explicitly; the stream
@@ -347,7 +337,7 @@ namespace toml
 			friend std::basic_ostream<T>& operator << (std::basic_ostream<T>&, default_formatter<U>&&);
 	};
 
-	#if !TOML_ALL_INLINE
+	#if !defined(DOXYGEN) && !TOML_HEADER_ONLY
 		extern template class TOML_API default_formatter<char>;
 	#endif
 
@@ -373,6 +363,22 @@ namespace toml
 		return lhs << rhs; //as lvalue
 	}
 
+	#ifndef DOXYGEN
+
+	#if !TOML_HEADER_ONLY
+		extern template TOML_API std::ostream& operator << (std::ostream&, default_formatter<char>&);
+		extern template TOML_API std::ostream& operator << (std::ostream&, default_formatter<char>&&);
+		extern template TOML_API std::ostream& operator << (std::ostream&, const table&);
+		extern template TOML_API std::ostream& operator << (std::ostream&, const array&);
+		extern template TOML_API std::ostream& operator << (std::ostream&, const value<std::string>&);
+		extern template TOML_API std::ostream& operator << (std::ostream&, const value<int64_t>&);
+		extern template TOML_API std::ostream& operator << (std::ostream&, const value<double>&);
+		extern template TOML_API std::ostream& operator << (std::ostream&, const value<bool>&);
+		extern template TOML_API std::ostream& operator << (std::ostream&, const value<toml::date>&);
+		extern template TOML_API std::ostream& operator << (std::ostream&, const value<toml::time>&);
+		extern template TOML_API std::ostream& operator << (std::ostream&, const value<toml::date_time>&);
+	#endif
+
 	template <typename Char>
 	inline std::basic_ostream<Char>& operator << (std::basic_ostream<Char>& lhs, const table& rhs)
 	{
@@ -391,22 +397,9 @@ namespace toml
 		return lhs << default_formatter<Char>{ rhs };
 	}
 
-	#if !TOML_ALL_INLINE
-		extern template TOML_API std::ostream& operator << (std::ostream&, default_formatter<char>&);
-		extern template TOML_API std::ostream& operator << (std::ostream&, default_formatter<char>&&);
-		extern template TOML_API std::ostream& operator << (std::ostream&, const table&);
-		extern template TOML_API std::ostream& operator << (std::ostream&, const array&);
-		extern template TOML_API std::ostream& operator << (std::ostream&, const value<std::string>&);
-		extern template TOML_API std::ostream& operator << (std::ostream&, const value<int64_t>&);
-		extern template TOML_API std::ostream& operator << (std::ostream&, const value<double>&);
-		extern template TOML_API std::ostream& operator << (std::ostream&, const value<bool>&);
-		extern template TOML_API std::ostream& operator << (std::ostream&, const value<toml::date>&);
-		extern template TOML_API std::ostream& operator << (std::ostream&, const value<toml::time>&);
-		extern template TOML_API std::ostream& operator << (std::ostream&, const value<toml::date_time>&);
-	#endif
-
-	TOML_ABI_NAMESPACE_END // version
+	#endif // !DOXYGEN
 }
+TOML_NAMESPACE_END
 
 TOML_POP_WARNINGS // TOML_DISABLE_SWITCH_WARNINGS, TOML_DISABLE_PADDING_WARNINGS
 

include/toml++/toml_default_formatter.hpp

@@ -23,10 +23,8 @@ TOML_DISABLE_ARITHMETIC_WARNINGS
 TOML_DISABLE_PADDING_WARNINGS
 TOML_DISABLE_MISC_WARNINGS
 
-namespace toml
+TOML_IMPL_NAMESPACE_START
 {
-	TOML_IMPL_NAMESPACE_START
-
 	inline constexpr size_t default_formatter_line_wrap = 120_sz;
 
 	TOML_API
@@ -167,14 +165,11 @@ namespace toml
 	{
 		return (default_formatter_inline_columns(node) + starting_column_bias) > default_formatter_line_wrap;
 	}
-
-	TOML_IMPL_NAMESPACE_END
 }
+TOML_IMPL_NAMESPACE_END
 
-namespace toml
+TOML_NAMESPACE_START
 {
-	TOML_ABI_NAMESPACE_VERSION
-
 	template <typename Char>
 	inline void default_formatter<Char>::print_inline(const toml::table& tbl)
 	{
@@ -209,9 +204,8 @@ namespace toml
 		}
 		base::clear_naked_newline();
 	}
-
-	TOML_ABI_NAMESPACE_END // version
 }
+TOML_NAMESPACE_END
 
 // implementations of windows wide string nonsense
 #if TOML_WINDOWS_COMPAT
@@ -221,10 +215,8 @@ TOML_DISABLE_ALL_WARNINGS
 #include <Windows.h> // fuckkkk :(
 TOML_POP_WARNINGS
 
-namespace toml
+TOML_IMPL_NAMESPACE_START
 {
-	TOML_IMPL_NAMESPACE_START
-
 	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	std::string narrow(std::wstring_view str) noexcept
@@ -274,12 +266,10 @@ namespace toml
 	}
 
 	#endif // __cpp_lib_char8_t
-
-	TOML_IMPL_NAMESPACE_END
 }
+TOML_IMPL_NAMESPACE_END
 
 #endif // TOML_WINDOWS_COMPAT
 
 TOML_POP_WARNINGS // TOML_DISABLE_SWITCH_WARNINGS, TOML_DISABLE_ARITHMETIC_WARNINGS,
 				  // TOML_DISABLE_PADDING_WARNINGS, TOML_DISABLE_MISC_WARNINGS
-

include/toml++/toml_formatter.h

@@ -10,17 +10,15 @@ TOML_PUSH_WARNINGS
 TOML_DISABLE_SWITCH_WARNINGS
 TOML_DISABLE_PADDING_WARNINGS
 
-namespace toml
+TOML_NAMESPACE_START
 {
-	TOML_ABI_NAMESPACE_VERSION
-
 	/// \brief	Format flags for modifying how TOML data is printed to streams.
 	enum class format_flags : uint8_t
 	{
 		/// \brief None.
 		none,
 
-		/// \brief Sates and times will be emitted as quoted strings.
+		/// \brief Dates and times will be emitted as quoted strings.
 		quote_dates_and_times = 1,
 
 		/// \brief Strings will be emitted as single-quoted literal strings where possible.
@@ -47,14 +45,11 @@ namespace toml
 	{
 		return static_cast<format_flags>( impl::unbox_enum(lhs) | impl::unbox_enum(rhs) );
 	}
-
-	TOML_ABI_NAMESPACE_END // version
 }
+TOML_NAMESPACE_END
 
-namespace toml
+TOML_IMPL_NAMESPACE_START
 {
-	TOML_IMPL_NAMESPACE_START
-
 	template <typename Char = char>
 	class TOML_API formatter
 	{
@@ -249,11 +244,11 @@ namespace toml
 			{}
 	};
 
-	#if !TOML_ALL_INLINE
+	#if !defined(DOXYGEN) && !TOML_HEADER_ONLY
 		extern template class TOML_API formatter<char>;
 	#endif
 
-	TOML_IMPL_NAMESPACE_END
 }
+TOML_IMPL_NAMESPACE_END
 
 TOML_POP_WARNINGS // TOML_DISABLE_SWITCH_WARNINGS, TOML_DISABLE_PADDING_WARNINGS

include/toml++/toml_instantiations.hpp

@@ -9,8 +9,8 @@
 #if !TOML_IMPLEMENTATION
 	#error This is an implementation-only header.
 #endif
-#if TOML_ALL_INLINE
-	#error This header cannot not be included when TOML_ALL_INLINE is enabled.
+#if TOML_HEADER_ONLY
+	#error This header cannot not be included when TOML_HEADER_ONLY is enabled.
 #endif
 //# }}
 
@@ -28,24 +28,19 @@ TOML_POP_WARNINGS
 #endif
 
 // internal implementation namespace
-namespace toml
+TOML_IMPL_NAMESPACE_START
 {
-	TOML_IMPL_NAMESPACE_START
-
 	// formatters
 	template class TOML_API formatter<char>;
 
 	// print to stream machinery
 	template TOML_API void print_floating_point_to_stream(double, std::ostream&, bool);
-
-	TOML_IMPL_NAMESPACE_END
 }
+TOML_IMPL_NAMESPACE_END
 
 // public namespace
-namespace toml
+TOML_NAMESPACE_START
 {
-	TOML_ABI_NAMESPACE_VERSION
-
 	// value<>
 	template class TOML_API value<std::string>;
 	template class TOML_API value<int64_t>;
@@ -156,6 +151,5 @@ namespace toml
 		TOML_ABI_NAMESPACE_END // TOML_EXCEPTIONS
 
 	#endif // TOML_PARSER
-
-	TOML_ABI_NAMESPACE_END // version
 }
+TOML_NAMESPACE_END

include/toml++/toml_json_formatter.h

@@ -10,15 +10,8 @@ TOML_PUSH_WARNINGS
 TOML_DISABLE_SWITCH_WARNINGS
 TOML_DISABLE_PADDING_WARNINGS
 
-namespace toml
+TOML_NAMESPACE_START
 {
-	TOML_ABI_NAMESPACE_VERSION
-
-	template <typename T, typename U>
-	std::basic_ostream<T>& operator << (std::basic_ostream<T>&, json_formatter<U>&);
-	template <typename T, typename U>
-	std::basic_ostream<T>& operator << (std::basic_ostream<T>&, json_formatter<U>&&);
-
 	/// \brief	A wrapper for printing TOML objects out to a stream as formatted JSON.
 	///
 	/// \detail \cpp
@@ -132,7 +125,7 @@ namespace toml
 			friend std::basic_ostream<T>& operator << (std::basic_ostream<T>&, json_formatter<U>&&);
 	};
 	
-	#if !TOML_ALL_INLINE
+	#if !defined(DOXYGEN) && !TOML_HEADER_ONLY
 		extern template class TOML_API json_formatter<char>;
 	#endif
 
@@ -157,12 +150,11 @@ namespace toml
 		return lhs << rhs; //as lvalue
 	}
 
-	#if !TOML_ALL_INLINE
+	#if !defined(DOXYGEN) && !TOML_HEADER_ONLY
 		extern template TOML_API std::ostream& operator << (std::ostream&, json_formatter<char>&);
 		extern template TOML_API std::ostream& operator << (std::ostream&, json_formatter<char>&&);
 	#endif
-
-	TOML_ABI_NAMESPACE_END // version
 }
+TOML_NAMESPACE_END
 
 TOML_POP_WARNINGS // TOML_DISABLE_SWITCH_WARNINGS, TOML_DISABLE_PADDING_WARNINGS

include/toml++/toml_json_formatter.hpp

@@ -16,10 +16,8 @@
 TOML_PUSH_WARNINGS
 TOML_DISABLE_SWITCH_WARNINGS
 
-namespace toml
+TOML_NAMESPACE_START
 {
-	TOML_ABI_NAMESPACE_VERSION
-
 	template <typename Char>
 	inline void json_formatter<Char>::print(const toml::table& tbl)
 	{
@@ -59,8 +57,7 @@ namespace toml
 		}
 		base::clear_naked_newline();
 	}
-
-	TOML_ABI_NAMESPACE_END // version
 }
+TOML_NAMESPACE_END
 
 TOML_POP_WARNINGS // TOML_DISABLE_SWITCH_WARNINGS

include/toml++/toml_node.h

@@ -61,10 +61,8 @@ TOML_DISABLE_MISC_WARNINGS
 	TOML_SA_LIST_NXT	"A TOML node type"						\
 	TOML_SA_NODE_TYPE_LIST
 
-namespace toml
+TOML_NAMESPACE_START
 {
-	TOML_ABI_NAMESPACE_VERSION
-
 	/// \brief	A TOML node.
 	///
 	/// \detail A parsed TOML document forms a tree made up of tables, arrays and values.
@@ -203,10 +201,15 @@ namespace toml
 
 		private:
 
+
+			#ifndef DOXYGEN
+
 			template <typename T>
 			[[nodiscard]]
 			decltype(auto) get_value_exact() const noexcept;
 
+			#endif // !DOXYGEN
+
 		public:
 
 			/// \brief	Gets the value contained by this node.
@@ -714,9 +717,8 @@ namespace toml
 				return do_ref<T>(*this);
 			}
 	};
-
-	TOML_ABI_NAMESPACE_END // version
 }
+TOML_NAMESPACE_END
 
 TOML_POP_WARNINGS // TOML_DISABLE_PADDING_WARNINGS, TOML_DISABLE_MISC_WARNINGS
 

include/toml++/toml_node.hpp

@@ -16,10 +16,8 @@
 TOML_PUSH_WARNINGS
 TOML_DISABLE_SUGGEST_WARNINGS
 
-namespace toml
+TOML_NAMESPACE_START
 {
-	TOML_ABI_NAMESPACE_VERSION
-
 	TOML_EXTERNAL_LINKAGE
 	node::node(node && other) noexcept
 		: source_{ std::move(other.source_) }
@@ -72,8 +70,7 @@ namespace toml
 	TOML_MEMBER_ATTR(const) const source_region& node::source()				const noexcept { return source_; }
 
 	#undef TOML_MEMBER_ATTR
-
-	TOML_ABI_NAMESPACE_END // version
 }
+TOML_NAMESPACE_END
 
 TOML_POP_WARNINGS // TOML_DISABLE_SUGGEST_WARNINGS

include/toml++/toml_node_view.h

@@ -11,13 +11,8 @@
 TOML_PUSH_WARNINGS
 TOML_DISABLE_ARITHMETIC_WARNINGS
 
-namespace toml
+TOML_NAMESPACE_START
 {
-	TOML_ABI_NAMESPACE_VERSION
-
-	template <typename Char, typename T>
-	inline std::basic_ostream<Char>& operator << (std::basic_ostream<Char>&, const node_view<T>&);
-
 	/// \brief	A view of a node.
 	/// 
 	/// \detail A node_view is like a std::optional<toml::node> with lots of toml-specific stuff built-in.
@@ -172,7 +167,7 @@ namespace toml
 			[[nodiscard]] auto as_date_time() const noexcept { return as<date_time>(); }
 
 			/// \brief	Gets the value contained by the referenced node.
-			/// 
+			///
 			/// \detail This function has 'exact' retrieval semantics; the only return value types allowed are the
 			/// 		TOML native value types, or types that can losslessly represent a native value type (e.g.
 			/// 		std::wstring on Windows).
@@ -489,7 +484,7 @@ namespace toml
 		return os;
 	}
 
-	#if !TOML_ALL_INLINE
+	#if !defined(DOXYGEN) && !TOML_HEADER_ONLY
 
 	extern template class TOML_API node_view<node>;
 	extern template class TOML_API node_view<const node>;
@@ -542,9 +537,8 @@ namespace toml
 	#endif
 	#undef TOML_EXTERN
 
-	#endif // !TOML_ALL_INLINE
-
-	TOML_ABI_NAMESPACE_END // version
+	#endif // !TOML_HEADER_ONLY
 }
+TOML_NAMESPACE_END
 
 TOML_POP_WARNINGS // TOML_DISABLE_ARITHMETIC_WARNINGS

include/toml++/toml_parse_error.h

@@ -21,13 +21,11 @@ TOML_PUSH_WARNINGS
 TOML_DISABLE_INIT_WARNINGS
 TOML_DISABLE_MISC_WARNINGS
 
-namespace toml
+TOML_NAMESPACE_START
 {
-	TOML_ABI_NAMESPACE_VERSION
-
 	TOML_ABI_NAMESPACE_BOOL(TOML_EXCEPTIONS, ex, noex)
 
-	#if TOML_DOXYGEN || !TOML_EXCEPTIONS
+	#if defined(DOXYGEN) || !TOML_EXCEPTIONS
 
 	/// \brief	An error generated when parsing fails.
 	/// 
@@ -154,11 +152,10 @@ namespace toml
 		return lhs;
 	}
 
-	#if !TOML_ALL_INLINE
+	#if !defined(DOXYGEN) && !TOML_HEADER_ONLY
 		extern template TOML_API std::ostream& operator << (std::ostream&, const parse_error&);
 	#endif
-
-	TOML_ABI_NAMESPACE_END // version
 }
+TOML_NAMESPACE_END
 
 TOML_POP_WARNINGS

include/toml++/toml_parser.h

@@ -16,13 +16,11 @@
 TOML_PUSH_WARNINGS
 TOML_DISABLE_PADDING_WARNINGS
 
-namespace toml
+TOML_NAMESPACE_START
 {
-	TOML_ABI_NAMESPACE_VERSION
-
 	TOML_ABI_NAMESPACE_BOOL(TOML_EXCEPTIONS, ex, noex)
 
-	#if TOML_DOXYGEN || !TOML_EXCEPTIONS
+	#if defined(DOXYGEN) || !TOML_EXCEPTIONS
 
 	/// \brief	The result of a parsing operation.
 	///
@@ -329,22 +327,18 @@ namespace toml
 	#endif
 
 	TOML_ABI_NAMESPACE_END // TOML_EXCEPTIONS
-
-	TOML_ABI_NAMESPACE_END // version
 }
+TOML_NAMESPACE_END
 
-namespace toml
+TOML_IMPL_NAMESPACE_START
 {
-	TOML_IMPL_NAMESPACE_START
-
 	TOML_ABI_NAMESPACE_BOOL(TOML_EXCEPTIONS, ex, noex)
 	
 	[[nodiscard]] TOML_API parse_result do_parse(utf8_reader_interface&&) TOML_MAY_THROW;
 	
 	TOML_ABI_NAMESPACE_END // TOML_EXCEPTIONS
-
-	TOML_IMPL_NAMESPACE_END
 }
+TOML_IMPL_NAMESPACE_END
 
 #if TOML_EXCEPTIONS
 	#define TOML_THROW_PARSE_ERROR(msg, path)												\
@@ -358,10 +352,8 @@ namespace toml
 		}}
 #endif
 
-namespace toml
+TOML_NAMESPACE_START
 {
-	TOML_ABI_NAMESPACE_VERSION
-
 	TOML_ABI_NAMESPACE_BOOL(TOML_EXCEPTIONS, ex, noex)
 
 	/// \brief	Parses a TOML document from a string view.
@@ -716,7 +708,7 @@ namespace toml
 			return parse(file, std::move(file_path_str));
 	}
 
-	#if !TOML_ALL_INLINE
+	#if !defined(DOXYGEN) && !TOML_HEADER_ONLY
 		extern template TOML_API parse_result parse(std::istream&, std::string_view) TOML_MAY_THROW;
 		extern template TOML_API parse_result parse(std::istream&, std::string&&) TOML_MAY_THROW;
 		extern template TOML_API parse_result parse_file(std::string_view) TOML_MAY_THROW;
@@ -742,24 +734,6 @@ namespace toml
 		return parse_file(std::basic_string_view<Char>{ file_path });
 	}
 
-	/// \brief	Convenience literal operators for working with toml++.
-	/// 
-	/// \detail This namespace exists so you can safely hoist the UDL operators into another scope
-	/// 		 without dragging in everything in the toml namespace: \cpp
-	/// 
-	/// #include <toml++/toml.h>
-	///	using namespace toml::literals;
-	///
-	///	int main()
-	///	{
-	///		auto tbl = "vals = [1, 2, 3]"_toml;
-	///
-	///		// ... do stuff with the table generated by the "_toml" UDL ...
-	///
-	///		return 0;
-	///	}
-	/// \ecpp
-	///
 	inline namespace literals
 	{
 		/// \brief	Parses TOML data from a string literal.
@@ -817,9 +791,8 @@ namespace toml
 	}
 
 	TOML_ABI_NAMESPACE_END // TOML_EXCEPTIONS
-
-	TOML_ABI_NAMESPACE_END // version
 }
+TOML_NAMESPACE_END
 
 #undef TOML_THROW_PARSE_ERROR
 

include/toml++/toml_parser.hpp

@@ -24,7 +24,7 @@ TOML_DISABLE_ALL_WARNINGS
 #if !TOML_INT_CHARCONV || !TOML_FLOAT_CHARCONV
 	#include <sstream>
 #endif
-#if !TOML_ALL_INLINE
+#if !TOML_HEADER_ONLY
 	using namespace std::string_view_literals;
 #endif
 TOML_POP_WARNINGS
@@ -39,7 +39,7 @@ TOML_DISABLE_PADDING_WARNINGS
 	#define TOML_RETURNS_BY_THROWING
 #endif
 
-namespace TOML_ANONYMOUS_NAMESPACE
+TOML_ANON_NAMESPACE_START
 {
 	template <uint64_t> struct parse_integer_traits;
 	template <> struct parse_integer_traits<2> final
@@ -77,7 +77,6 @@ namespace TOML_ANONYMOUS_NAMESPACE
 		static constexpr auto prefix = "x"sv;
 	};
 
-
 	[[nodiscard]]
 	TOML_INTERNAL_LINKAGE
 	std::string_view to_sv(::toml::node_type val) noexcept
@@ -253,13 +252,11 @@ namespace TOML_ANONYMOUS_NAMESPACE
 		toml::node* value;
 	};
 
-	TOML_ANONYMOUS_NAMESPACE_END
 }
+TOML_ANON_NAMESPACE_END
 
-namespace toml
+TOML_IMPL_NAMESPACE_START
 {
-	TOML_IMPL_NAMESPACE_START
-
 	// Q: "what the fuck is this? MACROS????"
 	// A: The parser needs to work in exceptionless mode (returning error objects directly)
 	//    and exception mode (reporting parse failures by throwing). Two totally different control flows.
@@ -2941,14 +2938,11 @@ namespace toml
 	#undef advance_and_return_if_error
 	#undef advance_and_return_if_error_or_eof
 	#undef assert_or_assume
-
-	TOML_IMPL_NAMESPACE_END
 }
+TOML_IMPL_NAMESPACE_END
 
-namespace toml
+TOML_NAMESPACE_START
 {
-	TOML_ABI_NAMESPACE_VERSION
-
 	TOML_ABI_NAMESPACE_BOOL(TOML_EXCEPTIONS, ex, noex)
 
 	TOML_API
@@ -3027,8 +3021,7 @@ namespace toml
 	}
 
 	TOML_ABI_NAMESPACE_END // TOML_EXCEPTIONS
-
-	TOML_ABI_NAMESPACE_END // version
 }
+TOML_NAMESPACE_END
 
 TOML_POP_WARNINGS // TOML_DISABLE_SWITCH_WARNINGS, TOML_DISABLE_PADDING_WARNINGS

include/toml++/toml_preprocessor.h

@@ -3,82 +3,48 @@
 //# See https://github.com/marzer/tomlplusplus/blob/master/LICENSE for the full license text.
 // SPDX-License-Identifier: MIT
 
-#pragma once
 // clang-format off
 
-////////// CONFIGURATION
-
-#ifdef TOML_CONFIG_HEADER
-	#include TOML_CONFIG_HEADER
-#endif
-
-#if !defined(TOML_ALL_INLINE) || (defined(TOML_ALL_INLINE) && TOML_ALL_INLINE) || defined(__INTELLISENSE__)
-	#undef TOML_ALL_INLINE
-	#define TOML_ALL_INLINE 1
-#endif
-
-#if defined(TOML_IMPLEMENTATION) || TOML_ALL_INLINE
-	#undef TOML_IMPLEMENTATION
-	#define TOML_IMPLEMENTATION 1
-#else
-	#define TOML_IMPLEMENTATION 0
-#endif
-
-#ifndef TOML_API
-	#define TOML_API
-#endif
-
-#ifndef TOML_UNRELEASED_FEATURES
-	#define TOML_UNRELEASED_FEATURES 0
-#endif
-
-#ifndef TOML_LARGE_FILES
-	#define TOML_LARGE_FILES 0
-#endif
-
-#ifndef TOML_UNDEF_MACROS
-	#define TOML_UNDEF_MACROS 1
-#endif
-
-#ifndef TOML_PARSER
-	#define TOML_PARSER 1
-#endif
-
-#if (defined(_WIN32) || defined(DOXYGEN)) && !defined(TOML_WINDOWS_COMPAT)
-	#define TOML_WINDOWS_COMPAT 1
-#endif
-#if !(defined(_WIN32) || defined(DOXYGEN)) || !defined(TOML_WINDOWS_COMPAT)
-	#undef TOML_WINDOWS_COMPAT
-	#define TOML_WINDOWS_COMPAT 0
-#endif
-
-#ifdef TOML_OPTIONAL_TYPE
-	#define TOML_HAS_CUSTOM_OPTIONAL_TYPE 1
-#else
-	#define TOML_HAS_CUSTOM_OPTIONAL_TYPE 0
-#endif
-
-#ifdef TOML_CHAR_8_STRINGS
-	#if TOML_CHAR_8_STRINGS
-		#error TOML_CHAR_8_STRINGS was removed in toml++ 2.0.0; \
-all value setters and getters can now work with char8_t strings implicitly so changing the underlying string type \
-is no longer necessary.
-	#endif
-#endif
-
-////////// COMPILER & ENVIRONMENT
-
+#pragma once
 #ifndef __cplusplus
 	#error toml++ is a C++ library.
 #endif
-#ifdef DOXYGEN
-	#undef	TOML_DOXYGEN
-	#define TOML_DOXYGEN 1
-#endif
-#ifndef TOML_DOXYGEN
-	#define TOML_DOXYGEN 0
+
+//#====================================================================================================================
+//# COMPILER DETECTION
+//#====================================================================================================================
+
+#ifdef __INTELLISENSE__
+	#define TOML_INTELLISENSE		1
+#else
+	#define TOML_INTELLISENSE		0
 #endif
 #ifdef __clang__
+	#define TOML_CLANG				__clang_major__
+#else
+	#define TOML_CLANG				0
+#endif
+#ifdef __INTEL_COMPILER
+	#define TOML_ICC				__INTEL_COMPILER
+#else
+	#define TOML_ICC				0
+#endif
+#if defined(_MSC_VER) && !TOML_CLANG && !TOML_ICC
+	#define TOML_MSVC				_MSC_VER
+#else
+	#define TOML_MSVC				0
+#endif
+#if defined(__GNUC__) && !TOML_CLANG && !TOML_ICC
+	#define TOML_GCC				__GNUC__
+#else
+	#define TOML_GCC				0
+#endif
+
+//#====================================================================================================================
+//# CLANG
+//#====================================================================================================================
+
+#if TOML_CLANG
 
 	#define TOML_PUSH_WARNINGS					_Pragma("clang diagnostic push")
 	#define TOML_DISABLE_SWITCH_WARNINGS		_Pragma("clang diagnostic ignored \"-Wswitch\"")
@@ -138,7 +104,13 @@ is no longer necessary.
 
 	#define TOML_SIMPLE_STATIC_ASSERT_MESSAGES	1
 
-#elif defined(_MSC_VER) || (defined(__INTEL_COMPILER) && defined(__ICL))
+#endif // clang
+
+//#====================================================================================================================
+//# MSVC
+//#====================================================================================================================
+
+#if TOML_MSVC || (defined(_MSC_VER) && TOML_ICC && defined(__ICL))
 
 	#define TOML_PUSH_WARNINGS				__pragma(warning(push))
 	#define TOML_DISABLE_SWITCH_WARNINGS	__pragma(warning(disable: 4063))
@@ -164,7 +136,13 @@ is no longer necessary.
 		#define TOML_COMPILER_EXCEPTIONS 0
 	#endif
 
-#elif defined(__GNUC__)
+#endif // msvc
+
+//#====================================================================================================================
+//# GCC
+//#====================================================================================================================
+
+#if TOML_GCC
 
 	#define TOML_PUSH_WARNINGS					_Pragma("GCC diagnostic push")
 	#define TOML_DISABLE_SWITCH_WARNINGS		_Pragma("GCC diagnostic ignored \"-Wswitch\"")						\
@@ -194,12 +172,12 @@ is no longer necessary.
 												TOML_DISABLE_MISC_WARNINGS
 	#define TOML_POP_WARNINGS					_Pragma("GCC diagnostic pop")
 
-	#define TOML_ATTR(...)					__attribute__((__VA_ARGS__))
+	#define TOML_ATTR(...)						__attribute__((__VA_ARGS__))
 	#ifndef TOML_ALWAYS_INLINE
-		#define TOML_ALWAYS_INLINE			__attribute__((__always_inline__)) inline
+		#define TOML_ALWAYS_INLINE				__attribute__((__always_inline__)) inline
 	#endif
-	#define TOML_NEVER_INLINE				__attribute__((__noinline__))
-	#define TOML_UNREACHABLE				__builtin_unreachable()
+	#define TOML_NEVER_INLINE					__attribute__((__noinline__))
+	#define TOML_UNREACHABLE					__builtin_unreachable()
 	#if !defined(TOML_RELOPS_REORDERING) && defined(__cpp_impl_three_way_comparison)
 		#define TOML_RELOPS_REORDERING 1
 	#endif
@@ -208,8 +186,8 @@ is no longer necessary.
 	#else
 		#define TOML_COMPILER_EXCEPTIONS 0
 	#endif
-	#define TOML_LIKELY(...)				(__builtin_expect(!!(__VA_ARGS__), 1) )
-	#define TOML_UNLIKELY(...)				(__builtin_expect(!!(__VA_ARGS__), 0) )
+	#define TOML_LIKELY(...)					(__builtin_expect(!!(__VA_ARGS__), 1) )
+	#define TOML_UNLIKELY(...)					(__builtin_expect(!!(__VA_ARGS__), 0) )
 
 	// floating-point from_chars and to_chars are not implemented in any version of gcc as of 1/1/2020
 	#ifndef TOML_FLOAT_CHARCONV
@@ -218,6 +196,83 @@ is no longer necessary.
 
 #endif
 
+//#====================================================================================================================
+//# USER CONFIGURATION
+//#====================================================================================================================
+
+#ifdef TOML_CONFIG_HEADER
+	#include TOML_CONFIG_HEADER
+#endif
+ 
+#ifdef DOXYGEN
+	#define TOML_HEADER_ONLY 0
+	#define TOML_WINDOWS_COMPAT 1
+#endif
+
+#if defined(TOML_ALL_INLINE) && !defined(TOML_HEADER_ONLY)
+	#define TOML_HEADER_ONLY	TOML_ALL_INLINE
+#endif
+
+#if !defined(TOML_HEADER_ONLY) || (defined(TOML_HEADER_ONLY) && TOML_HEADER_ONLY) || TOML_INTELLISENSE
+	#undef TOML_HEADER_ONLY
+	#define TOML_HEADER_ONLY 1
+#endif
+
+#if defined(TOML_IMPLEMENTATION) || TOML_HEADER_ONLY
+	#undef TOML_IMPLEMENTATION
+	#define TOML_IMPLEMENTATION 1
+#else
+	#define TOML_IMPLEMENTATION 0
+#endif
+
+#ifndef TOML_API
+	#define TOML_API
+#endif
+
+#ifndef TOML_UNRELEASED_FEATURES
+	#define TOML_UNRELEASED_FEATURES 0
+#endif
+
+#ifndef TOML_LARGE_FILES
+	#define TOML_LARGE_FILES 0
+#endif
+
+#ifndef TOML_UNDEF_MACROS
+	#define TOML_UNDEF_MACROS 1
+#endif
+
+#ifndef TOML_PARSER
+	#define TOML_PARSER 1
+#endif
+
+#ifndef DOXYGEN
+	#if defined(_WIN32) && !defined(TOML_WINDOWS_COMPAT)
+		#define TOML_WINDOWS_COMPAT 1
+	#endif
+	#if !defined(_WIN32) || !defined(TOML_WINDOWS_COMPAT)
+		#undef TOML_WINDOWS_COMPAT
+		#define TOML_WINDOWS_COMPAT 0
+	#endif
+#endif
+
+#ifdef TOML_OPTIONAL_TYPE
+	#define TOML_HAS_CUSTOM_OPTIONAL_TYPE 1
+#else
+	#define TOML_HAS_CUSTOM_OPTIONAL_TYPE 0
+#endif
+
+#ifdef TOML_CHAR_8_STRINGS
+	#if TOML_CHAR_8_STRINGS
+		#error TOML_CHAR_8_STRINGS was removed in toml++ 2.0.0; \
+all value setters and getters can now work with char8_t strings implicitly so changing the underlying string type \
+is no longer necessary.
+	#endif
+#endif
+
+//#====================================================================================================================
+//# ATTRIBUTES, UTILITY MACROS ETC
+//#====================================================================================================================
+
 #ifndef TOML_CPP_VERSION
 	#define TOML_CPP_VERSION __cplusplus
 #endif
@@ -236,6 +291,12 @@ is no longer necessary.
 #endif
 #undef TOML_CPP_VERSION
 
+#ifdef __has_include
+	#define TOML_HAS_INCLUDE(header)		__has_include(header)
+#else
+	#define TOML_HAS_INCLUDE(header)		0
+#endif
+
 #ifndef TOML_COMPILER_EXCEPTIONS
 	#define TOML_COMPILER_EXCEPTIONS 1
 #endif
@@ -264,7 +325,7 @@ is no longer necessary.
 #ifndef TOML_FLOAT_CHARCONV
 	#define TOML_FLOAT_CHARCONV 1
 #endif
-#if (TOML_INT_CHARCONV || TOML_FLOAT_CHARCONV) && !__has_include(<charconv>)
+#if (TOML_INT_CHARCONV || TOML_FLOAT_CHARCONV) && !TOML_HAS_INCLUDE(<charconv>)
 	#undef TOML_INT_CHARCONV
 	#undef TOML_FLOAT_CHARCONV
 	#define TOML_INT_CHARCONV 0
@@ -314,10 +375,6 @@ is no longer necessary.
 	#define TOML_EMPTY_BASES
 #endif
 
-#ifndef TOML_ALWAYS_INLINE
-	#define TOML_ALWAYS_INLINE	inline
-#endif
-
 #ifndef TOML_NEVER_INLINE
 	#define TOML_NEVER_INLINE
 #endif
@@ -338,7 +395,7 @@ is no longer necessary.
 	#define TOML_CONSTEVAL		constexpr
 #endif
 
-#if !TOML_DOXYGEN && !defined(__INTELLISENSE__)
+#if !defined(DOXYGEN) && !TOML_INTELLISENSE
 	#if !defined(TOML_LIKELY) && __has_cpp_attribute(likely)
 		#define TOML_LIKELY(...)	(__VA_ARGS__) [[likely]]
 	#endif
@@ -376,6 +433,62 @@ is no longer necessary.
 		__VA_ARGS__ [[nodiscard]] friend bool operator != (RHS rhs, LHS lhs) noexcept { return !(lhs == rhs); }
 #endif
 
+#ifndef TOML_SIMPLE_STATIC_ASSERT_MESSAGES
+	#define TOML_SIMPLE_STATIC_ASSERT_MESSAGES	0
+#endif
+
+#define TOML_CONCAT_1(x, y) x##y
+#define TOML_CONCAT(x, y) TOML_CONCAT_1(x, y)
+
+#define TOML_EVAL_BOOL_1(T, F)	T
+#define TOML_EVAL_BOOL_0(T, F)	F
+
+#if defined(__aarch64__) || defined(__ARM_ARCH_ISA_A64) || defined(_M_ARM64) || defined(__ARM_64BIT_STATE)	\
+		|| defined(__arm__) || defined(_M_ARM) || defined(__ARM_32BIT_STATE)
+	#define TOML_ARM 1
+#else
+	#define TOML_ARM 0
+#endif
+ 
+
+
+//#====================================================================================================================
+//# EXTENDED INT AND FLOAT TYPES
+//#====================================================================================================================
+
+#ifdef __FLT16_MANT_DIG__
+	#if __FLT_RADIX__ == 2					\
+			&& __FLT16_MANT_DIG__ == 11		\
+			&& __FLT16_DIG__ == 3			\
+			&& __FLT16_MIN_EXP__ == -13		\
+			&& __FLT16_MIN_10_EXP__ == -4	\
+			&& __FLT16_MAX_EXP__ == 16		\
+			&& __FLT16_MAX_10_EXP__ == 4
+		#if (TOML_ARM && TOML_GCC) || TOML_CLANG
+			#define TOML_FP16 __fp16
+		#endif
+		#if TOML_ARM && (TOML_GCC || TOML_CLANG)
+			#define TOML_FLOAT16 _Float16
+		#endif
+	#endif
+#endif
+
+#if defined(__SIZEOF_FLOAT128__)		\
+	&& defined(__FLT128_MANT_DIG__)		\
+	&& defined(__LDBL_MANT_DIG__)		\
+	&& __FLT128_MANT_DIG__ > __LDBL_MANT_DIG__
+	#define TOML_FLOAT128	__float128
+#endif
+
+#ifdef __SIZEOF_INT128__
+	#define TOML_INT128		__int128_t
+	#define TOML_UINT128	__uint128_t
+#endif
+
+//#====================================================================================================================
+//# VERSIONS AND NAMESPACES
+//#====================================================================================================================
+
 #include "toml_version.h"
 //# {{
 #define	TOML_LIB_SINGLE_HEADER 0
@@ -401,44 +514,49 @@ is no longer necessary.
 #define TOML_LANG_UNRELEASED														\
 		TOML_LANG_HIGHER_THAN(TOML_LANG_MAJOR, TOML_LANG_MINOR, TOML_LANG_PATCH)
 
-#define TOML_CONCAT_1(x, y) x##y
-#define TOML_CONCAT(x, y) TOML_CONCAT_1(x, y)
-
-#define TOML_EVAL_BOOL_1(T, F)	T
-#define TOML_EVAL_BOOL_0(T, F)	F
-
-#if TOML_DOXYGEN // || defined(__INTELLISENSE__)
-	#define TOML_ABI_NAMESPACES					0
-	#define TOML_ABI_NAMESPACE_START(name)
-	#define TOML_ABI_NAMESPACE_VERSION
-	#define TOML_ABI_NAMESPACE_BOOL(cond, T, F)
-	#define TOML_ABI_NAMESPACE_END
-#else
-	#define TOML_ABI_NAMESPACES					1
+#ifndef TOML_ABI_NAMESPACES
+	#ifdef DOXYGEN
+		#define TOML_ABI_NAMESPACES 0
+	#else
+		#define TOML_ABI_NAMESPACES 1
+	#endif
+#endif
+#if TOML_ABI_NAMESPACES
+	#define TOML_NAMESPACE_START				namespace toml { inline namespace TOML_CONCAT(v, TOML_LIB_MAJOR)
+	#define TOML_NAMESPACE_END					}
+	#define TOML_NAMESPACE						::toml::TOML_CONCAT(v, TOML_LIB_MAJOR)
 	#define TOML_ABI_NAMESPACE_START(name)		inline namespace name {
-	#define TOML_ABI_NAMESPACE_VERSION			TOML_ABI_NAMESPACE_START(TOML_CONCAT(v, TOML_LIB_MAJOR))
 	#define TOML_ABI_NAMESPACE_BOOL(cond, T, F)	TOML_ABI_NAMESPACE_START(TOML_CONCAT(TOML_EVAL_BOOL_, cond)(T, F))
 	#define TOML_ABI_NAMESPACE_END				}
-#endif
-
-#define TOML_IMPL_NAMESPACE_START			TOML_ABI_NAMESPACE_VERSION namespace impl {
-#define TOML_IMPL_NAMESPACE_END				} TOML_ABI_NAMESPACE_END
-
-#if TOML_ALL_INLINE
-	#define TOML_EXTERNAL_LINKAGE			inline
-	#define TOML_INTERNAL_LINKAGE			inline
-	#define TOML_ANONYMOUS_NAMESPACE			toml { TOML_ABI_NAMESPACE_VERSION namespace impl
-	#define TOML_ANONYMOUS_NAMESPACE_END		} TOML_ABI_NAMESPACE_END
 #else
+	#define TOML_NAMESPACE_START				namespace toml
+	#define TOML_NAMESPACE_END
+	#define TOML_NAMESPACE						toml
+	#define TOML_ABI_NAMESPACE_START(...)
+	#define TOML_ABI_NAMESPACE_BOOL(...)
+	#define TOML_ABI_NAMESPACE_END
+#endif
+#define TOML_IMPL_NAMESPACE_START				TOML_NAMESPACE_START { namespace impl
+#define TOML_IMPL_NAMESPACE_END					} TOML_NAMESPACE_END
+#if TOML_HEADER_ONLY
+	#define TOML_ANON_NAMESPACE_START			TOML_IMPL_NAMESPACE_START
+	#define TOML_ANON_NAMESPACE_END				TOML_IMPL_NAMESPACE_END
+	#define TOML_ANON_NAMESPACE					TOML_NAMESPACE::impl
+	#define TOML_USING_ANON_NAMESPACE			using namespace TOML_ANON_NAMESPACE
+	#define TOML_EXTERNAL_LINKAGE				inline
+	#define TOML_INTERNAL_LINKAGE				inline
+#else
+	#define TOML_ANON_NAMESPACE_START			namespace
+	#define TOML_ANON_NAMESPACE_END
+	#define TOML_ANON_NAMESPACE
+	#define TOML_USING_ANON_NAMESPACE			(void)0
 	#define TOML_EXTERNAL_LINKAGE
-	#define TOML_INTERNAL_LINKAGE			static
-	#define TOML_ANONYMOUS_NAMESPACE
-	#define TOML_ANONYMOUS_NAMESPACE_END
+	#define TOML_INTERNAL_LINKAGE				static
 #endif
 
-#ifndef TOML_SIMPLE_STATIC_ASSERT_MESSAGES
-	#define TOML_SIMPLE_STATIC_ASSERT_MESSAGES	0
-#endif
+//#====================================================================================================================
+//# ASSERT
+//#====================================================================================================================
 
 TOML_PUSH_WARNINGS
 TOML_DISABLE_ALL_WARNINGS
@@ -446,14 +564,20 @@ TOML_DISABLE_ALL_WARNINGS
 	#if defined(NDEBUG) || !defined(_DEBUG)
 		#define TOML_ASSERT(expr)	(void)0
 	#else
-		#include <cassert>
+		#ifndef assert
+			#include <cassert>
+		#endif
 		#define TOML_ASSERT(expr)	assert(expr)
 	#endif
 #endif
 TOML_POP_WARNINGS
 
+//#====================================================================================================================
+//# DOXYGEN SPAM
+//#====================================================================================================================
+
 //# {{
-#if TOML_DOXYGEN
+#ifdef DOXYGEN
 
 /// \addtogroup		configuration		Library Configuration
 /// \brief Preprocessor macros for configuring library functionality.
@@ -463,14 +587,14 @@ TOML_POP_WARNINGS
 /// @{
 
 
-/// \def TOML_ALL_INLINE
+/// \def TOML_HEADER_ONLY
 /// \brief Sets whether the library is entirely inline.
 /// \detail Defaults to `1`.
 /// \remark Disabling this means that you must define #TOML_IMPLEMENTATION in
 ///	<strong><em>exactly one</em></strong> translation unit in your project:
 /// \cpp
 /// // global_header_that_includes_toml++.h
-/// #define TOML_ALL_INLINE 0
+/// #define TOML_HEADER_ONLY 0
 /// #include <toml.hpp>
 /// 
 /// // some_code_file.cpp
@@ -504,8 +628,8 @@ TOML_POP_WARNINGS
 
 
 /// \def TOML_IMPLEMENTATION
-/// \brief Enables the library's implementation when #TOML_ALL_INLINE is enabled.
-/// \detail Not defined by default. Meaningless when #TOML_ALL_INLINE is disabled.
+/// \brief Enables the library's implementation when #TOML_HEADER_ONLY is enabled.
+/// \detail Not defined by default. Meaningless when #TOML_HEADER_ONLY is disabled.
 
 
 /// \def TOML_LARGE_FILES
@@ -534,7 +658,8 @@ TOML_POP_WARNINGS
 /// \def TOML_SMALL_FLOAT_TYPE
 /// \brief If your codebase has an additional 'small' float type (e.g. half-precision), this tells toml++ about it.
 /// \detail Not defined by default.
-
+/// \attention If you're building for a platform that has a built-in half precision float (e.g. `_Float16`), you don't
+/// 		   need to use this configuration option to make toml++ aware of it; the library comes with that built-in.
 
 #define TOML_SMALL_INT_TYPE
 /// \def TOML_SMALL_INT_TYPE
@@ -563,7 +688,7 @@ TOML_POP_WARNINGS
 
 
 /// @}
-#endif // TOML_DOXYGEN
+#endif // DOXYGEN
 //# }}
 
 // clang-format on

include/toml++/toml_print_to_stream.h

@@ -19,10 +19,8 @@ TOML_DISABLE_ALL_WARNINGS
 #endif
 TOML_POP_WARNINGS
 
-namespace toml
+TOML_IMPL_NAMESPACE_START
 {
-	TOML_IMPL_NAMESPACE_START
-
 	// Q: "why does print_to_stream() exist? why not just use ostream::write(), ostream::put() etc?"
 	// A: - I'm supporting C++20's char8_t as well; wrapping streams allows switching string modes transparently.
 	//    - I'm using <charconv> to format numerics. Faster and locale-independent.
@@ -208,7 +206,7 @@ namespace toml
 		}
 	}
 
-	#if !TOML_ALL_INLINE
+	#if !defined(DOXYGEN) && !TOML_HEADER_ONLY
 		extern template TOML_API void print_floating_point_to_stream(double, std::ostream&, bool);
 	#endif
 
@@ -352,15 +350,12 @@ namespace toml
 		}
 	}
 
-	TOML_POP_WARNINGS
-
-	TOML_IMPL_NAMESPACE_END
+	TOML_POP_WARNINGS // TOML_DISABLE_ARITHMETIC_WARNINGS
 }
+TOML_IMPL_NAMESPACE_END
 
-namespace toml
+TOML_NAMESPACE_START
 {
-	TOML_ABI_NAMESPACE_VERSION
-
 	/// \brief	Prints a source_position to a stream.
 	///
 	/// \detail \cpp
@@ -432,10 +427,9 @@ namespace toml
 		return lhs;
 	}
 
-	#if !TOML_ALL_INLINE
+	#if !defined(DOXYGEN) && !TOML_HEADER_ONLY
 		extern template TOML_API std::ostream& operator << (std::ostream&, const source_position&);
 		extern template TOML_API std::ostream& operator << (std::ostream&, const source_region&);
 	#endif
-
-	TOML_ABI_NAMESPACE_END // version
 }
+TOML_NAMESPACE_END

include/toml++/toml_table.h

@@ -10,10 +10,8 @@ TOML_PUSH_WARNINGS
 TOML_DISABLE_MISC_WARNINGS
 TOML_DISABLE_PADDING_WARNINGS
 
-namespace toml
+TOML_IMPL_NAMESPACE_START
 {
-	TOML_IMPL_NAMESPACE_START
-
 	template <bool IsConst>
 	struct table_proxy_pair final
 	{
@@ -192,19 +190,11 @@ namespace toml
 
 		#endif
 	};
-
-	TOML_IMPL_NAMESPACE_END
 }
+TOML_IMPL_NAMESPACE_END
 
-namespace toml
+TOML_NAMESPACE_START
 {
-	TOML_ABI_NAMESPACE_VERSION
-
-	[[nodiscard]] TOML_API bool operator == (const table& lhs, const table& rhs) noexcept;
-	[[nodiscard]] TOML_API bool operator != (const table& lhs, const table& rhs) noexcept;
-	template <typename Char>
-	std::basic_ostream<Char>& operator << (std::basic_ostream<Char>&, const table&);
-
 	/// \brief A BidirectionalIterator for iterating over key-value pairs in a toml::table.
 	using table_iterator = impl::table_iterator<false>;
 
@@ -1031,8 +1021,7 @@ namespace toml
 			template <typename Char>
 			friend std::basic_ostream<Char>& operator << (std::basic_ostream<Char>&, const table&);
 	};
-
-	TOML_ABI_NAMESPACE_END // version
 }
+TOML_NAMESPACE_END
 
 TOML_POP_WARNINGS // TOML_DISABLE_MISC_WARNINGS, TOML_DISABLE_PADDING_WARNINGS

include/toml++/toml_table.hpp

@@ -18,10 +18,8 @@ TOML_PUSH_WARNINGS
 TOML_DISABLE_SUGGEST_WARNINGS
 TOML_DISABLE_PADDING_WARNINGS
 
-namespace toml
+TOML_NAMESPACE_START
 {
-	TOML_ABI_NAMESPACE_VERSION
-
 	TOML_EXTERNAL_LINKAGE
 	table::table(impl::table_init_pair* pairs, size_t count) noexcept
 	{
@@ -235,9 +233,8 @@ namespace toml
 	{
 		return !(lhs == rhs);
 	}
-
-	TOML_ABI_NAMESPACE_END // version
 }
+TOML_NAMESPACE_END
 
 TOML_POP_WARNINGS // TOML_DISABLE_SUGGEST_WARNINGS, TOML_DISABLE_PADDING_WARNINGS
 

include/toml++/toml_utf8.h

@@ -6,11 +6,10 @@
 
 #pragma once
 #include "toml_utf8_generated.h"
+#ifndef DOXYGEN
 
-namespace toml
+TOML_IMPL_NAMESPACE_START
 {
-	TOML_IMPL_NAMESPACE_START
-
 	template <typename... T>
 	[[nodiscard]]
 	TOML_ATTR(const)
@@ -241,6 +240,7 @@ namespace toml
 			state = state_table[state + uint_least32_t{ 256u } + type];
 		}
 	};
-
-	TOML_IMPL_NAMESPACE_END
 }
+TOML_IMPL_NAMESPACE_END
+
+#endif // !DOXYGEN

include/toml++/toml_utf8_generated.h

@@ -8,10 +8,10 @@
 #pragma once
 #include "toml_preprocessor.h"
 
-namespace toml
-{
-	TOML_IMPL_NAMESPACE_START
+#ifndef DOXYGEN
 
+TOML_IMPL_NAMESPACE_START
+{
 	//# Returns true if a codepoint matches any of:
 	//# 	0 - 9, A - F, a - f
 	[[nodiscard]]
@@ -23,7 +23,7 @@ namespace toml
 		return cp >= U'0' && cp <= U'f' && (1ull << (static_cast<ui64>(cp) - 0x30ull)) & 0x7E0000007E03FFull;
 	}
 
-#if TOML_LANG_UNRELEASED // toml/issues/687 (unicode bare keys)
+	#if TOML_LANG_UNRELEASED // toml/issues/687 (unicode bare keys)
 
 	//# Returns true if a codepoint belongs to any of these categories:
 	//# 	Ll, Lm, Lo, Lt, Lu
@@ -754,7 +754,9 @@ namespace toml
 		//# chunk summary: 2282 codepoints from 293 ranges (spanning a search area of 917232)
 	}
 
-#endif // TOML_LANG_UNRELEASED
+	#endif // TOML_LANG_UNRELEASED
 
-	TOML_IMPL_NAMESPACE_END
-} // toml::impl
+}
+TOML_IMPL_NAMESPACE_END
+
+#endif // !DOXYGEN

include/toml++/toml_utf8_streams.h

@@ -17,10 +17,8 @@ TOML_PUSH_WARNINGS
 TOML_DISABLE_PADDING_WARNINGS
 TOML_DISABLE_MISC_WARNINGS
 
-namespace toml
+TOML_IMPL_NAMESPACE_START
 {
-	TOML_IMPL_NAMESPACE_START
-
 	template <typename T>
 	class utf8_byte_stream;
 
@@ -382,8 +380,7 @@ namespace toml
 	};
 
 	TOML_ABI_NAMESPACE_END // TOML_EXCEPTIONS
-
-	TOML_IMPL_NAMESPACE_END
 }
+TOML_IMPL_NAMESPACE_END
 
 TOML_POP_WARNINGS // TOML_DISABLE_PADDING_WARNINGS, TOML_DISABLE_MISC_WARNINGS

include/toml++/toml_utf8_streams.hpp

@@ -21,9 +21,8 @@
 	#define TOML_ERROR_CHECK	if (reader.error()) return nullptr
 #endif
 
-namespace toml
+TOML_IMPL_NAMESPACE_START
 {
-	TOML_IMPL_NAMESPACE_START
 	TOML_ABI_NAMESPACE_BOOL(TOML_EXCEPTIONS, ex, noex)
 
 	TOML_EXTERNAL_LINKAGE
@@ -96,18 +95,16 @@ namespace toml
 	}
 
 	#if !TOML_EXCEPTIONS
-
 	TOML_EXTERNAL_LINKAGE
 	optional<parse_error>&& utf8_buffered_reader::error() noexcept
 	{
 		return reader.error();
 	}
-
 	#endif
 
 	TOML_ABI_NAMESPACE_END // TOML_EXCEPTIONS
-	TOML_IMPL_NAMESPACE_END
 }
+TOML_IMPL_NAMESPACE_END
 
 #undef TOML_ERROR_CHECK
 #undef TOML_ERROR

include/toml++/toml_value.h

@@ -12,10 +12,8 @@ TOML_DISABLE_ARITHMETIC_WARNINGS
 TOML_DISABLE_PADDING_WARNINGS
 TOML_DISABLE_MISC_WARNINGS
 
-namespace toml
+TOML_IMPL_NAMESPACE_START
 {
-	TOML_IMPL_NAMESPACE_START
-
 	template <typename T, typename...>
 	struct native_value_maker
 	{
@@ -105,17 +103,11 @@ namespace toml
 		}
 		return { static_cast<T>(val) };
 	}
-
-	TOML_IMPL_NAMESPACE_END
 }
+TOML_IMPL_NAMESPACE_END
 
-namespace toml
+TOML_NAMESPACE_START
 {
-	TOML_ABI_NAMESPACE_VERSION
-
-	template <typename Char, typename T>
-	std::basic_ostream<Char>& operator << (std::basic_ostream<Char>&, const value<T>&);
-
 	/// \brief	A TOML value.
 	/// 		
 	/// \tparam	ValueType	The value's native TOML data type. Can be one of:
@@ -305,7 +297,7 @@ namespace toml
 			{
 				if constexpr (std::is_same_v<value_type, double>)
 				{
-					using namespace ::toml::impl;
+					using namespace impl;
 					static constexpr auto pack = [](auto l, auto r) constexpr noexcept
 					{
 						return (static_cast<uint64_t>(unbox_enum(l)) << 32)
@@ -456,8 +448,12 @@ namespace toml
 					return impl::node_type_of<value_type> >= impl::node_type_of<T>;
 			}
 	};
+	template <typename T>
+	value(T) -> value<impl::native_type_of<impl::remove_cvref_t<T>>>;
 
-	#if !TOML_ALL_INLINE
+	#ifndef DOXYGEN
+
+	#if !TOML_HEADER_ONLY
 		extern template class TOML_API value<std::string>;
 		extern template class TOML_API value<int64_t>;
 		extern template class TOML_API value<double>;
@@ -467,9 +463,6 @@ namespace toml
 		extern template class TOML_API value<date_time>;
 	#endif
 	
-	template <typename T>
-	value(T) -> value<impl::native_type_of<impl::remove_cvref_t<T>>>;
-
 	TOML_PUSH_WARNINGS
 	TOML_DISABLE_INIT_WARNINGS
 	TOML_DISABLE_SWITCH_WARNINGS
@@ -478,7 +471,7 @@ namespace toml
 	[[nodiscard]]
 	inline decltype(auto) node::get_value_exact() const noexcept
 	{
-		using namespace ::toml::impl;
+		using namespace impl;
 
 		static_assert(node_type_of<T> != node_type::none);
 		static_assert(node_type_of<T> != node_type::table);
@@ -525,7 +518,7 @@ namespace toml
 	template <typename T>
 	inline optional<T> node::value_exact() const noexcept
 	{
-		using namespace ::toml::impl;
+		using namespace impl;
 
 		static_assert(
 			!is_wide_string<T> || TOML_WINDOWS_COMPAT,
@@ -571,7 +564,7 @@ namespace toml
 	template <typename T>
 	inline optional<T> node::value() const noexcept
 	{
-		using namespace ::toml::impl;
+		using namespace impl;
 
 		static_assert(
 			!is_wide_string<T> || TOML_WINDOWS_COMPAT,
@@ -714,7 +707,7 @@ namespace toml
 	template <typename T>
 	inline auto node::value_or(T&& default_value) const noexcept
 	{
-		using namespace ::toml::impl;
+		using namespace impl;
 
 		static_assert(
 			!is_wide_string<T> || TOML_WINDOWS_COMPAT,
@@ -811,7 +804,7 @@ namespace toml
 		}
 	}
 
-	#if !TOML_ALL_INLINE
+	#if !TOML_HEADER_ONLY
 
 	#define TOML_EXTERN(name, T)	\
 		extern template TOML_API optional<T>		node::name<T>() const noexcept
@@ -857,11 +850,12 @@ namespace toml
 	#endif
 	#undef TOML_EXTERN
 
-	#endif // !TOML_ALL_INLINE
+	#endif // !TOML_HEADER_ONLY
 
 	TOML_POP_WARNINGS // TOML_DISABLE_INIT_WARNINGS, TOML_DISABLE_SWITCH_WARNINGS
 
-	TOML_ABI_NAMESPACE_END // version
+	#endif // !DOXYGEN
 }
+TOML_NAMESPACE_END
 
 TOML_POP_WARNINGS // TOML_DISABLE_ARITHMETIC_WARNINGS, TOML_DISABLE_PADDING_WARNINGS

include/toml++/toml_version.h

@@ -7,7 +7,7 @@
 
 #define TOML_LIB_MAJOR		2
 #define TOML_LIB_MINOR		0
-#define TOML_LIB_PATCH		0
+#define TOML_LIB_PATCH		1
 
 #define TOML_LANG_MAJOR		1
 #define TOML_LANG_MINOR		0

meson.build

@@ -1,7 +1,7 @@
 project(
 	'tomlplusplus',
 	'cpp',
-	version : '2.0.0',
+	version : '2.0.1',
 	license : 'MIT',
 	default_options : [
 		'cpp_std=c++17',

python/generate_documentation.py

@@ -725,6 +725,10 @@ class SyntaxHighlightingFix(object):
 # adds links to external sources where appropriate
 class ExtDocLinksFix(object): 
 	__types = [
+		(r'static_cast','https://en.cppreference.com/w/cpp/language/static_cast'),
+		(r'const_cast','https://en.cppreference.com/w/cpp/language/const_cast'),
+		(r'dynamic_cast','https://en.cppreference.com/w/cpp/language/dynamic_cast'),
+		(r'reinterpret_cast','https://en.cppreference.com/w/cpp/language/reinterpret_cast'),
 		(r'(?:std::)?size_t', 'https://en.cppreference.com/w/cpp/types/size_t'),
 		(r'(?:std::)?u?int(?:8|16|32|64)(fast|least)?_ts?', 'https://en.cppreference.com/w/cpp/types/integer'),
 		(r'std::pairs?', 'https://en.cppreference.com/w/cpp/utility/pair'),
@@ -800,6 +804,7 @@ class ExtDocLinksFix(object):
 		(r'std::countr_zero', 'https://en.cppreference.com/w/cpp/numeric/countr_zero'),
 		(r'std::countl_one', 'https://en.cppreference.com/w/cpp/numeric/countl_one'),
 		(r'std::countr_one', 'https://en.cppreference.com/w/cpp/numeric/countr_one'),
+		(r'std::popcount', 'https://en.cppreference.com/w/cpp/numeric/popcount'),
 		(r'std::has_single_bit', 'https://en.cppreference.com/w/cpp/numeric/has_single_bit'),
 		(r'std::min', 'https://en.cppreference.com/w/cpp/algorithm/min'),
 		(r'std::max', 'https://en.cppreference.com/w/cpp/algorithm/max'),
@@ -818,6 +823,8 @@ class ExtDocLinksFix(object):
 			r'(?:__INTELLISENSE__|_MSC_FULL_VER|_MSC_VER|_MSVC_LANG|_WIN32|_WIN64)',
 			'https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=vs-2019'
 		),
+		(r'IUnknowns?', 'https://docs.microsoft.com/en-us/windows/win32/api/unknwn/nn-unknwn-iunknown'),
+		(r'(?:IUnknown::)?QueryInterface?', 'https://docs.microsoft.com/en-us/windows/win32/api/unknwn/nf-unknwn-iunknown-queryinterface(q)'),
 		(r'(?:Legacy)?InputIterators?', 'https://en.cppreference.com/w/cpp/named_req/InputIterator'),
 		(r'(?:Legacy)?OutputIterators?', 'https://en.cppreference.com/w/cpp/named_req/OutputIterator'),
 		(r'(?:Legacy)?ForwardIterators?', 'https://en.cppreference.com/w/cpp/named_req/ForwardIterator'),

python/generate_single_header.py

@@ -51,14 +51,6 @@ class Preprocessor:
 
 
 
-def increment_dict_value(dict, key, delta = 1):
-	if key in dict:
-		dict[key] = dict[key] + delta
-	else:
-		dict[key] = delta
-
-
-
 def main():
 
 	# preprocess header(s)
@@ -70,6 +62,7 @@ def main():
 	source_text = re.sub('(?://[/#!<].*?)\n', '\n', source_text, 0, re.I | re.M) # remove 'magic' comments
 	source_text = re.sub('([^ \t])[ \t]+\n', '\\1\n', source_text, 0, re.I | re.M) # remove trailing whitespace
 	source_text = re.sub('\n(?:[ \t]*\n[ \t]*)+\n', '\n\n', source_text, 0, re.I | re.M) # remove double newlines
+
 	# source_text = re.sub(  # blank lines between various preprocessor directives
 	# 	'[#](endif(?:\s*//[^\n]*)?)\n{2,}[#](ifn?(?:def)?|define)',
 	# 	'#\\1\n#\\2',
@@ -164,20 +157,44 @@ def main():
 		output_str = output.getvalue().strip()
 
 		# analyze the output to find any potentially missing #undefs
-		#re_define = re.compile(r'^\s*#\s*define\s+([a-zA-Z0-9_]+)(?:$|\s|\()')
-		#re_undef = re.compile(r'^\s*#\s*undef\s+([a-zA-Z0-9_]+)(?:$|\s|//)')
-		#defines = dict()
-		#for output_line in output_str.splitlines():
-		#	m = re_define.match(output_line)
-		#	if m:
-		#		increment_dict_value(defines, m.group(1))
-		#	else:
-		#		m = re_undef.match(output_line)
-		#		if m:
-		#			increment_dict_value(defines, m.group(1), -1)
-		#for define, num in defines.items():
-		#	if num > 0:
-		#		print(f"  {define} {num}")
+		re_define = re.compile(r'^\s*#\s*define\s+([a-zA-Z0-9_]+)(?:$|\s|\()')
+		re_undef = re.compile(r'^\s*#\s*undef\s+([a-zA-Z0-9_]+)(?:$|\s|//)')
+		defines = dict()
+		for output_line in output_str.splitlines():
+			defined = True
+			m = re_define.match(output_line)
+			if not m:
+				defined = False
+				m = re_undef.match(output_line)
+			if m:
+				defines[m.group(1)] = defined
+		ignore_list = ( # macros that are meant to stay public (user configs etc)
+			'TOML_API',
+			'TOML_UNRELEASED_FEATURES',
+			'TOML_LARGE_FILES',
+			'TOML_PARSER',
+			'TOML_WINDOWS_COMPAT',
+			'TOML_EXCEPTIONS',
+			'TOML_LIB_SINGLE_HEADER',
+			'TOML_LIB_MAJOR',
+			'TOML_LIB_MINOR',
+			'TOML_LIB_PATCH',
+			'TOML_LANG_MAJOR',
+			'TOML_LANG_MINOR',
+			'TOML_LANG_PATCH',
+			'TOML_UNDEF_MACROS',
+			'TOML_HEADER_ONLY',
+			'TOML_ALL_INLINE'
+		)
+		set_defines = []
+		for define, currently_set in defines.items():
+			if currently_set and define not in ignore_list:
+				set_defines.append(define)
+		if len(set_defines) > 0:
+			set_defines.sort()
+			print(f"Potentially missing #undefs:")
+			for define in set_defines:
+				print(f"\t#undef {define}")
 
 		# write the output file
 		output_file_path = path.join(utils.get_script_folder(), '..', 'toml.hpp')

python/generate_unicode_functions.py

@@ -1113,10 +1113,10 @@ def write_to_files(codepoints, header_file, test_file):
 	header('#pragma once')
 	header('#include "toml_preprocessor.h"')
 	header('')
-	header('namespace toml')
-	header('{')
-	header('	TOML_IMPL_NAMESPACE_START')
+	header('#ifndef DOXYGEN')
 	header('')
+	header('TOML_IMPL_NAMESPACE_START')
+	header('{')
 
 	test('#include "tests.h"')
 	test('#include "unicode.h"')
@@ -1125,7 +1125,7 @@ def write_to_files(codepoints, header_file, test_file):
 
 	emit_character_function('is_hexadecimal_digit', header_file, test_file, codepoints, ('a', 'f'), ('A', 'F'), ('0', '9'))
 
-	both('#if TOML_LANG_UNRELEASED // toml/issues/687 (unicode bare keys)')
+	both('\t#if TOML_LANG_UNRELEASED // toml/issues/687 (unicode bare keys)')
 	both('')
 	unicode_exclusions = SparseRange()
 	unicode_exclusions.add(0, 127) # ascii block
@@ -1133,11 +1133,13 @@ def write_to_files(codepoints, header_file, test_file):
 	emit_category_function('is_unicode_letter', header_file, test_file, codepoints, ('Ll', 'Lm', 'Lo', 'Lt', 'Lu'), unicode_exclusions)
 	emit_category_function('is_unicode_number', header_file, test_file, codepoints, ('Nd', 'Nl'), unicode_exclusions)
 	emit_category_function('is_unicode_combining_mark', header_file, test_file, codepoints, ('Mn', 'Mc'), unicode_exclusions)
-	both('#endif // TOML_LANG_UNRELEASED')
+	both('\t#endif // TOML_LANG_UNRELEASED')
 
 	header('')
-	header('	TOML_IMPL_NAMESPACE_END')
-	header('} // toml::impl')
+	header('}')
+	header('TOML_IMPL_NAMESPACE_END')
+	header('')
+	header('#endif // !DOXYGEN')
 
 
 def main():

python/generate_windows_test_targets.py

@@ -14,23 +14,29 @@ from uuid import UUID, uuid5
 
 def main():
 
-	mode_keys = [ 'x86', 'cpplatest', 'unrel', 'noexcept' ]
+	mode_keys = [ '!!debug', '!x86', 'cpplatest', 'unrel', 'noexcept' ]
 	modes = [ [] ]
 	for n in range(1, len(mode_keys)):
 		for combo in itertools.combinations(mode_keys, n):
 			modes.append([i for i in combo])
 	modes.append(mode_keys)
 	for mode in modes:
-		if 'x86' not in mode:
-			mode.insert(0, 'x64')
+		if '!x86' not in mode:
+			mode.insert(0, '!x64')
+		if '!!debug' not in mode:
+			mode.insert(0, '!!release')
+		mode.sort()
+		for i in range(0, len(mode)):
+			while mode[i].startswith('!'):
+				mode[i] = mode[i][1:]
 	modes.sort()
 
-	vs_root = path.join(utils.get_script_folder(), '..', 'vs')
+	test_root = path.join(utils.get_script_folder(), '..', 'vs', 'tests')
 	uuid_namespace = UUID('{51C7001B-048C-4AF0-B598-D75E78FF31F0}')
+	configuration_name = lambda x: 'Debug' if x.lower() == 'debug' else 'Release'
 	platform_name = lambda x: 'Win32' if x == 'x86' else x
-	language_level = lambda x: 'Win32' if x == 'x86' else x
 	for mode in modes:
-		file_path = path.join(vs_root, 'test_{}.vcxproj'.format('_'.join(mode)))
+		file_path = path.join(test_root, 'test_{}.vcxproj'.format('_'.join(mode)))
 		print("Writing to {}".format(file_path))
 		with open(file_path, 'w', encoding='utf-8-sig', newline='\r\n') as file:
 			write = lambda txt: print(txt, file=file)
@@ -38,12 +44,8 @@ def main():
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="Debug|{platform}">
-			<Configuration>Debug</Configuration>
-			<Platform>{platform}</Platform>
-		</ProjectConfiguration>
-		<ProjectConfiguration Include="Release|{platform}">
-			<Configuration>Release</Configuration>
+		<ProjectConfiguration Include="{configuration}|{platform}">
+			<Configuration>{configuration}</Configuration>
 			<Platform>{platform}</Platform>
 		</ProjectConfiguration>
 	</ItemGroup>
@@ -71,7 +73,7 @@ def main():
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
 			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<Import Project="toml++.props" />
+	<Import Project="../toml++.props" />
 	<ItemDefinitionGroup>
 		<ClCompile>
 			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -80,61 +82,64 @@ def main():
 			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
 			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES={unreleased_features};%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<LanguageStandard>std{standard}</LanguageStandard>
 		</ClCompile>
 	</ItemDefinitionGroup>
 	<PropertyGroup>
-		<LocalDebuggerWorkingDirectory>..\tests\</LocalDebuggerWorkingDirectory>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
 	</PropertyGroup>
 	<ItemGroup>
-		<ClCompile Include="..\tests\conformance_burntsushi_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_burntsushi_valid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_valid.cpp" />
-		<ClCompile Include="..\tests\impl_catch2.cpp">
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\impl_toml.cpp">
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\manipulating_arrays.cpp" />
-		<ClCompile Include="..\tests\manipulating_tables.cpp" />
-		<ClCompile Include="..\tests\manipulating_parse_result.cpp" />
-		<ClCompile Include="..\tests\manipulating_values.cpp" />
-		<ClCompile Include="..\tests\parsing_arrays.cpp" />
-		<ClCompile Include="..\tests\parsing_booleans.cpp" />
-		<ClCompile Include="..\tests\parsing_comments.cpp" />
-		<ClCompile Include="..\tests\parsing_dates_and_times.cpp" />
-		<ClCompile Include="..\tests\parsing_floats.cpp" />
-		<ClCompile Include="..\tests\parsing_integers.cpp" />
-		<ClCompile Include="..\tests\parsing_key_value_pairs.cpp" />
-		<ClCompile Include="..\tests\parsing_spec_example.cpp" />
-		<ClCompile Include="..\tests\parsing_strings.cpp" />
-		<ClCompile Include="..\tests\parsing_tables.cpp" />
-		<ClCompile Include="..\tests\tests.cpp">
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
 			<PrecompiledHeader>Create</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\unicode.cpp" />
-		<ClCompile Include="..\tests\unicode_generated.cpp" />
-		<ClCompile Include="..\tests\windows_compat.cpp" />
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
 	</ItemGroup>
 	<ItemGroup>
-		<Natvis Include="toml++.natvis" />
+		<Natvis Include="..\toml++.natvis" />
 	</ItemGroup>
 	<ItemGroup>
-		<ClInclude Include="..\tests\catch2.h" />
-		<ClInclude Include="..\tests\evil_macros.h" />
-		<ClInclude Include="..\tests\settings.h" />
-		<ClInclude Include="..\tests\tests.h" />
-		<ClInclude Include="..\tests\tloptional.h" />
-		<ClInclude Include="..\tests\unicode.h" />
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
 	</ItemGroup>
 	<ItemGroup>
-		<None Include="..\tests\meson.build" />
+		<None Include="..\..\tests\meson.build" />
 	</ItemGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
 			'''.strip().format(
+				configuration=next(configuration_name(x) for x in mode if x in ('debug', 'release')),
 				platform=next(platform_name(x) for x in mode if x in ('x64', 'x86')),
 				uuid=str(uuid5(uuid_namespace, '_'.join(mode))).upper(),
 				exceptions='false' if 'noexcept' in mode else 'Sync',

tests/impl_toml.cpp

@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "settings.h"
-#if !TOML_ALL_INLINE
+#if !TOML_HEADER_ONLY
 	#define TOML_IMPLEMENTATION
 #endif
 
@@ -18,22 +18,31 @@
 	#include "../include/toml++/toml.h"
 #endif
 
+#if defined(TOML_FP16) ^ SHOULD_HAVE_FP16
+	#error TOML_FP16 was not deduced correctly
+#endif
+#if defined(TOML_FLOAT16) ^ SHOULD_HAVE_FLOAT16
+	#error TOML_FLOAT16 was not deduced correctly
+#endif
+#if defined(TOML_FLOAT128) ^ SHOULD_HAVE_FLOAT128
+	#error TOML_FLOAT128 was not deduced correctly
+#endif
+#if defined(TOML_INT128) ^ SHOULD_HAVE_INT128
+	#error TOML_INT128 was not deduced correctly
+#endif
+#if defined(TOML_INT128) ^ defined(TOML_UINT128)
+	#error TOML_INT128 and TOML_UINT128 must both be defined, or neither be defined
+#endif
+#if TOML_COMPILER_EXCEPTIONS != SHOULD_HAVE_EXCEPTIONS
+	#error TOML_COMPILER_EXCEPTIONS was not deduced correctly
+#endif
 #if TOML_COMPILER_EXCEPTIONS != TOML_EXCEPTIONS
 	#error TOML_EXCEPTIONS does not match TOML_COMPILER_EXCEPTIONS (default behaviour should be to match)
 #endif
-
 #if (defined(_WIN32) && !TOML_WINDOWS_COMPAT) || (!defined(_WIN32) && TOML_WINDOWS_COMPAT)
 	#error TOML_WINDOWS_COMPAT does not match _WIN32 (default behaviour should be to match)
 #endif
 
-#ifdef __SIZEOF_INT128__
-	#define int128 __int128_t
-	#define uint128 __uint128_t
-#endif
-#if defined(FLT16_MANT_DIG) && defined(FLT16_DIG) && defined(FLT16_DECIMAL_DIG)
-	#define float16 _Float16
-#endif
-
 namespace toml
 {
 	using std::declval;
@@ -81,12 +90,18 @@ namespace toml
 	CHECK_CAN_REPRESENT_NATIVE(uint64_t,				false);
 	CHECK_CAN_REPRESENT_NATIVE(float,					false);
 	CHECK_CAN_REPRESENT_NATIVE(double,					true);
-	#ifdef int128
-	CHECK_CAN_REPRESENT_NATIVE(int128,					true);
-	CHECK_CAN_REPRESENT_NATIVE(uint128,					false);
+	#ifdef TOML_INT128
+	CHECK_CAN_REPRESENT_NATIVE(TOML_INT128,				true);
+	CHECK_CAN_REPRESENT_NATIVE(TOML_UINT128,			false);
 	#endif
-	#ifdef float16
-	CHECK_CAN_REPRESENT_NATIVE(float16,					false);
+	#ifdef TOML_FP16
+	CHECK_CAN_REPRESENT_NATIVE(TOML_FP16, false);
+	#endif
+	#ifdef TOML_FLOAT16
+	CHECK_CAN_REPRESENT_NATIVE(TOML_FLOAT16,			false);
+	#endif
+	#ifdef TOML_FLOAT128
+	CHECK_CAN_REPRESENT_NATIVE(TOML_FLOAT128,			true);
 	#endif
 
 	CHECK_CAN_REPRESENT_NATIVE(char*,					false);
@@ -177,15 +192,27 @@ namespace toml
 	CHECK_VALUE_OR(		int64_t&,						int64_t);
 	CHECK_VALUE_OR(		int64_t&&,						int64_t);
 	CHECK_VALUE_OR(		int64_t const,					int64_t);
-	#ifdef int128
-	CHECK_VALUE_OR(		int128,							int128);
-	CHECK_VALUE_OR(		int128&,						int128);
-	CHECK_VALUE_OR(		int128&&,						int128);
-	CHECK_VALUE_OR(		int128 const,					int128);
-	CHECK_VALUE_OR(		uint128,						uint128);
-	CHECK_VALUE_OR(		uint128&,						uint128);
-	CHECK_VALUE_OR(		uint128&&,						uint128);
-	CHECK_VALUE_OR(		uint128 const,					uint128);
+	#ifdef TOML_INT128
+	CHECK_VALUE_OR(		TOML_INT128,					TOML_INT128);
+	CHECK_VALUE_OR(		TOML_INT128&,					TOML_INT128);
+	CHECK_VALUE_OR(		TOML_INT128&&,					TOML_INT128);
+	CHECK_VALUE_OR(		TOML_INT128 const,				TOML_INT128);
+	CHECK_VALUE_OR(		TOML_UINT128,					TOML_UINT128);
+	CHECK_VALUE_OR(		TOML_UINT128&,					TOML_UINT128);
+	CHECK_VALUE_OR(		TOML_UINT128&&,					TOML_UINT128);
+	CHECK_VALUE_OR(		TOML_UINT128 const,				TOML_UINT128);
+	#endif
+	#ifdef TOML_FP16
+	CHECK_VALUE_OR(		TOML_FP16,						TOML_FP16);
+	CHECK_VALUE_OR(		TOML_FP16&,						TOML_FP16);
+	CHECK_VALUE_OR(		TOML_FP16&&,					TOML_FP16);
+	CHECK_VALUE_OR(		TOML_FP16 const,				TOML_FP16);
+	#endif
+	#ifdef TOML_FLOAT16
+	CHECK_VALUE_OR(		TOML_FLOAT16,					TOML_FLOAT16);
+	CHECK_VALUE_OR(		TOML_FLOAT16&,					TOML_FLOAT16);
+	CHECK_VALUE_OR(		TOML_FLOAT16&&,					TOML_FLOAT16);
+	CHECK_VALUE_OR(		TOML_FLOAT16 const,				TOML_FLOAT16);
 	#endif
 	CHECK_VALUE_OR(		float,							float);
 	CHECK_VALUE_OR(		float&,							float);
@@ -195,6 +222,12 @@ namespace toml
 	CHECK_VALUE_OR(		double&,						double);
 	CHECK_VALUE_OR(		double&&,						double);
 	CHECK_VALUE_OR(		double const,					double);
+	#ifdef TOML_FLOAT128
+	CHECK_VALUE_OR(		TOML_FLOAT128,					TOML_FLOAT128);
+	CHECK_VALUE_OR(		TOML_FLOAT128&,					TOML_FLOAT128);
+	CHECK_VALUE_OR(		TOML_FLOAT128&&,				TOML_FLOAT128);
+	CHECK_VALUE_OR(		TOML_FLOAT128 const,			TOML_FLOAT128);
+	#endif
 	CHECK_VALUE_OR(		char*,							const char*);
 	CHECK_VALUE_OR(		char*&,							const char*);
 	CHECK_VALUE_OR(		char*&&,						const char*);

tests/meson.build

@@ -36,7 +36,7 @@ compiler_supports_cpp20 = compiler.links('''
 		return 0;
 	}
 	''',
-	name : 'supports C++20',
+	name : 'supports c++20',
 	args : [ '-std=c++2a' ]
 )
 
@@ -84,20 +84,113 @@ compiler_supports_consteval = compiler_supports_cpp20 and compiler.compiles('''
 	args : [ '-std=c++2a' ]
 )
 
-compiler_supports_float16_args = []
+float_16_preprocessor_single_check_template = '''
+	#ifndef @0@
+		#error @0@ wasn't defined!
+	#else
+		#pragma message("@0@: " MAKE_STRING(@0@))
+	#endif
+	#if @0@ != @1@
+		#error @0@ was not @1@!
+	#endif
+
+'''
+float_16_preprocessor_checks = '''
+	#define MAKE_STRING(s)		MAKE_STRING_1(s)
+	#define MAKE_STRING_1(s)	#s
+	''' + float_16_preprocessor_single_check_template.format('__FLT_RADIX__', '2')						\
+	+ float_16_preprocessor_single_check_template.format('__FLT16_MANT_DIG__', '11')					\
+	+ float_16_preprocessor_single_check_template.format('__FLT16_DIG__', '3')							\
+	+ float_16_preprocessor_single_check_template.format('__FLT16_MIN_EXP__', '-13')					\
+	+ float_16_preprocessor_single_check_template.format('__FLT16_MIN_10_EXP__', '-4')					\
+	+ float_16_preprocessor_single_check_template.format('__FLT16_MAX_EXP__', '16')						\
+	+ float_16_preprocessor_single_check_template.format('__FLT16_MAX_10_EXP__', '4')
+
+compiler_supports_float16_args = [ '-O0' ]
 if compiler.get_id() == 'gcc'
 	compiler_supports_float16_args += '-mfp16-format=ieee'
+	compiler_supports_float16_args += '-fmax-errors=1'
+elif compiler.get_id() == 'clang'
+	compiler_supports_float16_args += '-ferror-limit=1'
 endif
+compiler_supports_fp16 = compiler.links('''
+	@0@
+
+	int main()
+	{
+		static_assert(sizeof(__fp16) == 2);
+		__fp16 f = static_cast<__fp16>(1);
+		const auto f2 = static_cast<float>(f);
+		const auto f3 = static_cast<__fp16>(0.2L);
+		return 0;
+	}
+	'''.format(float_16_preprocessor_checks),
+	name : 'supports __fp16',
+	args : compiler_supports_float16_args
+)
 compiler_supports_float16 = compiler.links('''
+	@0@
+
 	int main()
 	{
 		static_assert(sizeof(_Float16) == 2);
 		_Float16 f = static_cast<_Float16>(1);
+		const auto f2 = static_cast<float>(f);
+		const auto f3 = static_cast<_Float16>(0.2L);
+		return 0;
+	}
+	'''.format(float_16_preprocessor_checks),
+	name : 'supports _Float16',
+	args : compiler_supports_float16_args
+)
+
+compiler_supports_int128 = compiler.links('''
+	#ifndef __SIZEOF_INT128__
+		#error __SIZEOF_INT128__ wasn't defined!
+	#endif
+
+	#include <cstdint>
+
+	int main()
+	{
+		static_assert(__SIZEOF_INT128__ == 16);
+		static_assert(sizeof(__int128_t) == 16);
+		static_assert(sizeof(__uint128_t) == 16);
+		__int128_t i = static_cast<__int128_t>(1);
+		const auto i2 = static_cast<int64_t>(i);
+		const auto i3 = static_cast<int32_t>(i);
 		return 0;
 	}
 	''',
-	name : 'supports float16',
-	args : compiler_supports_float16_args
+	name : 'supports __int128_t',
+	args : [ '-O0' ]
+)
+
+compiler_supports_float128 = compiler.links('''
+	#ifndef __SIZEOF_FLOAT128__
+		#error __SIZEOF_FLOAT128__ wasn't defined!
+	#endif
+	#ifndef __FLT128_MANT_DIG__
+		#error __FLT128_MANT_DIG__ wasn't defined!
+	#endif
+	#ifndef __LDBL_MANT_DIG__
+		#error __LDBL_MANT_DIG__ wasn't defined!
+	#endif
+	#if __FLT128_MANT_DIG__ <= __LDBL_MANT_DIG__
+		#error __FLT128_MANT_DIG__ was <= __LDBL_MANT_DIG__
+	#endif
+	int main()
+	{
+		static_assert(__SIZEOF_FLOAT128__ == 16);
+		static_assert(sizeof(__float128) == 16);
+		__float128 f = static_cast<__float128>(1);
+		const auto f2 = static_cast<long double>(f);
+		const auto f3 = static_cast<double>(f);
+		return 0;
+	}
+	''',
+	name : 'supports __float128',
+	args : [ '-O0' ]
 )
 
 compiler_supports_fast_math = compiler.links('''
@@ -119,6 +212,7 @@ unreleased_feature_modes = [ false, true ]
 cpp20_modes = [ false, true ]
 executables = []
 counter = 0
+
 foreach cpp20 : cpp20_modes
 	if cpp20 and not compiler_supports_cpp20
 		continue
@@ -146,9 +240,12 @@ foreach cpp20 : cpp20_modes
 						name = 'cpp17'
 					endif
 
-					if not exceptions
+					if exceptions
+						args += '-DSHOULD_HAVE_EXCEPTIONS=1'
+					else
 						name = name + '_noexcept'
 						overrides += 'cpp_eh=none'
+						args += '-DSHOULD_HAVE_EXCEPTIONS=0'
 					endif
 
 					if fast_math
@@ -159,6 +256,32 @@ foreach cpp20 : cpp20_modes
 						endif
 					endif
 
+					if compiler_supports_float16 or compiler_supports_fp16
+						if compiler.get_id() == 'gcc'
+							args += '-mfp16-format=ieee'
+						endif
+						if compiler_supports_fp16
+							args += '-DSHOULD_HAVE_FP16=1'
+						endif
+						if compiler_supports_float16
+							args += '-DSHOULD_HAVE_FLOAT16=1'
+						endif
+					endif
+
+					if compiler_supports_int128
+						args += '-DSHOULD_HAVE_INT128=1'
+					endif
+			
+					if compiler_supports_float128
+						args += '-DSHOULD_HAVE_FLOAT128=1'
+					endif
+
+					if compiler_supports_float16 or compiler_supports_int128 or compiler_supports_float128
+						if compiler.get_id() == 'gcc'
+							args += '-fext-numeric-literals'
+						endif
+					endif
+
 					if unrel
 						name = name + '_unrel'
 						args += '-DTOML_UNRELEASED_FEATURES=1'
@@ -167,7 +290,7 @@ foreach cpp20 : cpp20_modes
 					endif
 
 					if counter % 6 == 3
-						args += '-DTOML_ALL_INLINE=1'
+						args += '-DTOML_HEADER_ONLY=1'
 					endif
 					if counter % 2 == 1
 						args += '-DUSE_SINGLE_HEADER=1'

tests/settings.h

@@ -7,8 +7,8 @@
 
 // toml++ config
 #define TOML_UNDEF_MACROS 0
-#ifndef TOML_ALL_INLINE
-	#define TOML_ALL_INLINE 0
+#ifndef TOML_HEADER_ONLY
+	#define TOML_HEADER_ONLY 0
 #endif
 #ifndef USE_SINGLE_HEADER
 	#define USE_SINGLE_HEADER 0
@@ -76,3 +76,21 @@
 	#define NOWINMESSAGES //     - WM_*, EM_*, LB_*, CB_*
 	#define NOWINSTYLES //       - WS_*, CS_*, ES_*, LBS_*, SBS_*, CBS_*
 #endif
+
+// test harness stuff
+#ifndef SHOULD_HAVE_FP16
+	#define SHOULD_HAVE_FP16 0
+#endif
+#ifndef SHOULD_HAVE_FLOAT16
+	#define SHOULD_HAVE_FLOAT16 0
+#endif
+#ifndef SHOULD_HAVE_INT128
+	#define SHOULD_HAVE_INT128 0
+#endif
+#ifndef SHOULD_HAVE_FLOAT128
+	#define SHOULD_HAVE_FLOAT128 0
+#endif
+#ifndef SHOULD_HAVE_EXCEPTIONS
+	#define SHOULD_HAVE_EXCEPTIONS 1
+#endif
+

tests/unicode_generated.cpp

@@ -31,7 +31,7 @@ TEST_CASE("unicode - is_hexadecimal_digit")
 		REQUIRE(not_in(fn, r));
 }
 
-#if TOML_LANG_UNRELEASED // toml/issues/687 (unicode bare keys)
+	#if TOML_LANG_UNRELEASED // toml/issues/687 (unicode bare keys)
 
 TEST_CASE("unicode - is_unicode_letter")
 {
@@ -711,4 +711,4 @@ TEST_CASE("unicode - is_unicode_combining_mark")
 		REQUIRE(!fn(v));
 }
 
-#endif // TOML_LANG_UNRELEASED
+	#endif // TOML_LANG_UNRELEASED

vs/tests/test_debug_x64.vcxproj

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="Debug|x64">
+			<Configuration>Debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<VCProjectVersion>16.0</VCProjectVersion>
+		<ProjectGuid>{202DCF23-B4E4-5FB9-AFA8-CC9A718067FF}</ProjectGuid>
+		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>true</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>false</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="PropertySheets">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<Import Project="../toml++.props" />
+	<ItemDefinitionGroup>
+		<ClCompile>
+			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<ExceptionHandling>Sync</ExceptionHandling>
+			<PrecompiledHeader>Use</PrecompiledHeader>
+			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
+			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<LanguageStandard>stdcpp17</LanguageStandard>
+		</ClCompile>
+	</ItemDefinitionGroup>
+	<PropertyGroup>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
+	</PropertyGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
+			<PrecompiledHeader>Create</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
+	</ItemGroup>
+	<ItemGroup>
+		<Natvis Include="..\toml++.natvis" />
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="..\..\tests\meson.build" />
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

vs/tests/test_debug_x64_cpplatest.vcxproj

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="Debug|x64">
+			<Configuration>Debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<VCProjectVersion>16.0</VCProjectVersion>
+		<ProjectGuid>{B0B1EA1E-611A-59B6-939F-0A891C71BBF0}</ProjectGuid>
+		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>true</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>false</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="PropertySheets">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<Import Project="../toml++.props" />
+	<ItemDefinitionGroup>
+		<ClCompile>
+			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<ExceptionHandling>Sync</ExceptionHandling>
+			<PrecompiledHeader>Use</PrecompiledHeader>
+			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
+			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<LanguageStandard>stdcpplatest</LanguageStandard>
+		</ClCompile>
+	</ItemDefinitionGroup>
+	<PropertyGroup>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
+	</PropertyGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
+			<PrecompiledHeader>Create</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
+	</ItemGroup>
+	<ItemGroup>
+		<Natvis Include="..\toml++.natvis" />
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="..\..\tests\meson.build" />
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

vs/tests/test_debug_x64_cpplatest_noexcept.vcxproj

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="Debug|x64">
+			<Configuration>Debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<VCProjectVersion>16.0</VCProjectVersion>
+		<ProjectGuid>{2D040A50-F533-5977-AF7F-B25C29112025}</ProjectGuid>
+		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>true</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>false</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="PropertySheets">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<Import Project="../toml++.props" />
+	<ItemDefinitionGroup>
+		<ClCompile>
+			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<ExceptionHandling>false</ExceptionHandling>
+			<PrecompiledHeader>Use</PrecompiledHeader>
+			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
+			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<LanguageStandard>stdcpplatest</LanguageStandard>
+		</ClCompile>
+	</ItemDefinitionGroup>
+	<PropertyGroup>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
+	</PropertyGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
+			<PrecompiledHeader>Create</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
+	</ItemGroup>
+	<ItemGroup>
+		<Natvis Include="..\toml++.natvis" />
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="..\..\tests\meson.build" />
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

vs/tests/test_debug_x64_cpplatest_noexcept_unrel.vcxproj

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="Debug|x64">
+			<Configuration>Debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<VCProjectVersion>16.0</VCProjectVersion>
+		<ProjectGuid>{50988C9F-99C8-59C2-BCAA-AA1F0848472E}</ProjectGuid>
+		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>true</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>false</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="PropertySheets">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<Import Project="../toml++.props" />
+	<ItemDefinitionGroup>
+		<ClCompile>
+			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<ExceptionHandling>false</ExceptionHandling>
+			<PrecompiledHeader>Use</PrecompiledHeader>
+			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
+			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<LanguageStandard>stdcpplatest</LanguageStandard>
+		</ClCompile>
+	</ItemDefinitionGroup>
+	<PropertyGroup>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
+	</PropertyGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
+			<PrecompiledHeader>Create</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
+	</ItemGroup>
+	<ItemGroup>
+		<Natvis Include="..\toml++.natvis" />
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="..\..\tests\meson.build" />
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

vs/tests/test_debug_x64_cpplatest_unrel.vcxproj

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="Debug|x64">
+			<Configuration>Debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<VCProjectVersion>16.0</VCProjectVersion>
+		<ProjectGuid>{39175FCA-1342-507B-90F3-E8DCFB4C48D0}</ProjectGuid>
+		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>true</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>false</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="PropertySheets">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<Import Project="../toml++.props" />
+	<ItemDefinitionGroup>
+		<ClCompile>
+			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<ExceptionHandling>Sync</ExceptionHandling>
+			<PrecompiledHeader>Use</PrecompiledHeader>
+			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
+			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<LanguageStandard>stdcpplatest</LanguageStandard>
+		</ClCompile>
+	</ItemDefinitionGroup>
+	<PropertyGroup>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
+	</PropertyGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
+			<PrecompiledHeader>Create</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
+	</ItemGroup>
+	<ItemGroup>
+		<Natvis Include="..\toml++.natvis" />
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="..\..\tests\meson.build" />
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

vs/tests/test_debug_x64_noexcept.vcxproj

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="Debug|x64">
+			<Configuration>Debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<VCProjectVersion>16.0</VCProjectVersion>
+		<ProjectGuid>{70F7C29B-3468-5C09-8D47-B649CEBAB09E}</ProjectGuid>
+		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>true</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>false</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="PropertySheets">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<Import Project="../toml++.props" />
+	<ItemDefinitionGroup>
+		<ClCompile>
+			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<ExceptionHandling>false</ExceptionHandling>
+			<PrecompiledHeader>Use</PrecompiledHeader>
+			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
+			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<LanguageStandard>stdcpp17</LanguageStandard>
+		</ClCompile>
+	</ItemDefinitionGroup>
+	<PropertyGroup>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
+	</PropertyGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
+			<PrecompiledHeader>Create</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
+	</ItemGroup>
+	<ItemGroup>
+		<Natvis Include="..\toml++.natvis" />
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="..\..\tests\meson.build" />
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

vs/tests/test_debug_x64_noexcept_unrel.vcxproj

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="Debug|x64">
+			<Configuration>Debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<VCProjectVersion>16.0</VCProjectVersion>
+		<ProjectGuid>{62191BB3-97A9-552E-93BF-BFDF4D9905DD}</ProjectGuid>
+		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>true</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>false</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="PropertySheets">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<Import Project="../toml++.props" />
+	<ItemDefinitionGroup>
+		<ClCompile>
+			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<ExceptionHandling>false</ExceptionHandling>
+			<PrecompiledHeader>Use</PrecompiledHeader>
+			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
+			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<LanguageStandard>stdcpp17</LanguageStandard>
+		</ClCompile>
+	</ItemDefinitionGroup>
+	<PropertyGroup>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
+	</PropertyGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
+			<PrecompiledHeader>Create</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
+	</ItemGroup>
+	<ItemGroup>
+		<Natvis Include="..\toml++.natvis" />
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="..\..\tests\meson.build" />
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

vs/tests/test_debug_x64_unrel.vcxproj

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="Debug|x64">
+			<Configuration>Debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<VCProjectVersion>16.0</VCProjectVersion>
+		<ProjectGuid>{9A3431E3-4727-5FED-9C18-CCD300C2760E}</ProjectGuid>
+		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>true</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>false</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="PropertySheets">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<Import Project="../toml++.props" />
+	<ItemDefinitionGroup>
+		<ClCompile>
+			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<ExceptionHandling>Sync</ExceptionHandling>
+			<PrecompiledHeader>Use</PrecompiledHeader>
+			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
+			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<LanguageStandard>stdcpp17</LanguageStandard>
+		</ClCompile>
+	</ItemDefinitionGroup>
+	<PropertyGroup>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
+	</PropertyGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
+			<PrecompiledHeader>Create</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
+	</ItemGroup>
+	<ItemGroup>
+		<Natvis Include="..\toml++.natvis" />
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="..\..\tests\meson.build" />
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

vs/tests/test_debug_x86.vcxproj

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="Debug|Win32">
+			<Configuration>Debug</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<VCProjectVersion>16.0</VCProjectVersion>
+		<ProjectGuid>{CFBAF3E0-2F81-5178-964C-F419CD2F296D}</ProjectGuid>
+		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>true</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>false</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="PropertySheets">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<Import Project="../toml++.props" />
+	<ItemDefinitionGroup>
+		<ClCompile>
+			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<ExceptionHandling>Sync</ExceptionHandling>
+			<PrecompiledHeader>Use</PrecompiledHeader>
+			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
+			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<LanguageStandard>stdcpp17</LanguageStandard>
+		</ClCompile>
+	</ItemDefinitionGroup>
+	<PropertyGroup>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
+	</PropertyGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
+			<PrecompiledHeader>Create</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
+	</ItemGroup>
+	<ItemGroup>
+		<Natvis Include="..\toml++.natvis" />
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="..\..\tests\meson.build" />
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

vs/tests/test_debug_x86_cpplatest.vcxproj

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="Debug|Win32">
+			<Configuration>Debug</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<VCProjectVersion>16.0</VCProjectVersion>
+		<ProjectGuid>{AD9A5FC3-6B12-5B6F-86C0-AB2FBB8C7766}</ProjectGuid>
+		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>true</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>false</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="PropertySheets">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<Import Project="../toml++.props" />
+	<ItemDefinitionGroup>
+		<ClCompile>
+			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<ExceptionHandling>Sync</ExceptionHandling>
+			<PrecompiledHeader>Use</PrecompiledHeader>
+			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
+			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<LanguageStandard>stdcpplatest</LanguageStandard>
+		</ClCompile>
+	</ItemDefinitionGroup>
+	<PropertyGroup>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
+	</PropertyGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
+			<PrecompiledHeader>Create</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
+	</ItemGroup>
+	<ItemGroup>
+		<Natvis Include="..\toml++.natvis" />
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="..\..\tests\meson.build" />
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

vs/tests/test_debug_x86_cpplatest_noexcept.vcxproj

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="Debug|Win32">
+			<Configuration>Debug</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<VCProjectVersion>16.0</VCProjectVersion>
+		<ProjectGuid>{DC05B52F-D0ED-5F40-A5EC-92C4C1D77F98}</ProjectGuid>
+		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>true</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>false</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="PropertySheets">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<Import Project="../toml++.props" />
+	<ItemDefinitionGroup>
+		<ClCompile>
+			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<ExceptionHandling>false</ExceptionHandling>
+			<PrecompiledHeader>Use</PrecompiledHeader>
+			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
+			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<LanguageStandard>stdcpplatest</LanguageStandard>
+		</ClCompile>
+	</ItemDefinitionGroup>
+	<PropertyGroup>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
+	</PropertyGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
+			<PrecompiledHeader>Create</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
+	</ItemGroup>
+	<ItemGroup>
+		<Natvis Include="..\toml++.natvis" />
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="..\..\tests\meson.build" />
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

vs/tests/test_debug_x86_cpplatest_noexcept_unrel.vcxproj

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="Debug|Win32">
+			<Configuration>Debug</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<VCProjectVersion>16.0</VCProjectVersion>
+		<ProjectGuid>{41DC0274-FFA8-5D94-AF8D-5677E3141095}</ProjectGuid>
+		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>true</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>false</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="PropertySheets">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<Import Project="../toml++.props" />
+	<ItemDefinitionGroup>
+		<ClCompile>
+			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<ExceptionHandling>false</ExceptionHandling>
+			<PrecompiledHeader>Use</PrecompiledHeader>
+			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
+			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<LanguageStandard>stdcpplatest</LanguageStandard>
+		</ClCompile>
+	</ItemDefinitionGroup>
+	<PropertyGroup>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
+	</PropertyGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
+			<PrecompiledHeader>Create</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
+	</ItemGroup>
+	<ItemGroup>
+		<Natvis Include="..\toml++.natvis" />
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="..\..\tests\meson.build" />
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

vs/tests/test_debug_x86_cpplatest_unrel.vcxproj

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="Debug|Win32">
+			<Configuration>Debug</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<VCProjectVersion>16.0</VCProjectVersion>
+		<ProjectGuid>{C8B46DC3-994F-5A7C-98ED-3388BCE5D647}</ProjectGuid>
+		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>true</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>false</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="PropertySheets">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<Import Project="../toml++.props" />
+	<ItemDefinitionGroup>
+		<ClCompile>
+			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<ExceptionHandling>Sync</ExceptionHandling>
+			<PrecompiledHeader>Use</PrecompiledHeader>
+			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
+			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<LanguageStandard>stdcpplatest</LanguageStandard>
+		</ClCompile>
+	</ItemDefinitionGroup>
+	<PropertyGroup>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
+	</PropertyGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
+			<PrecompiledHeader>Create</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
+	</ItemGroup>
+	<ItemGroup>
+		<Natvis Include="..\toml++.natvis" />
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="..\..\tests\meson.build" />
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

vs/tests/test_debug_x86_noexcept.vcxproj

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="Debug|Win32">
+			<Configuration>Debug</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<VCProjectVersion>16.0</VCProjectVersion>
+		<ProjectGuid>{F7375F00-0345-5F67-89C0-2B18412B40FB}</ProjectGuid>
+		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>true</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>false</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="PropertySheets">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<Import Project="../toml++.props" />
+	<ItemDefinitionGroup>
+		<ClCompile>
+			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<ExceptionHandling>false</ExceptionHandling>
+			<PrecompiledHeader>Use</PrecompiledHeader>
+			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
+			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<LanguageStandard>stdcpp17</LanguageStandard>
+		</ClCompile>
+	</ItemDefinitionGroup>
+	<PropertyGroup>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
+	</PropertyGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
+			<PrecompiledHeader>Create</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
+	</ItemGroup>
+	<ItemGroup>
+		<Natvis Include="..\toml++.natvis" />
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="..\..\tests\meson.build" />
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

vs/tests/test_debug_x86_noexcept_unrel.vcxproj

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="Debug|Win32">
+			<Configuration>Debug</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<VCProjectVersion>16.0</VCProjectVersion>
+		<ProjectGuid>{92AAC430-36B0-51E4-8E39-F3C579EDB331}</ProjectGuid>
+		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>true</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>false</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="PropertySheets">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<Import Project="../toml++.props" />
+	<ItemDefinitionGroup>
+		<ClCompile>
+			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<ExceptionHandling>false</ExceptionHandling>
+			<PrecompiledHeader>Use</PrecompiledHeader>
+			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
+			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<LanguageStandard>stdcpp17</LanguageStandard>
+		</ClCompile>
+	</ItemDefinitionGroup>
+	<PropertyGroup>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
+	</PropertyGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
+			<PrecompiledHeader>Create</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
+	</ItemGroup>
+	<ItemGroup>
+		<Natvis Include="..\toml++.natvis" />
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="..\..\tests\meson.build" />
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

vs/tests/test_debug_x86_unrel.vcxproj

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="Debug|Win32">
+			<Configuration>Debug</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<VCProjectVersion>16.0</VCProjectVersion>
+		<ProjectGuid>{B1EAF133-1019-510F-A083-FC04774FF12E}</ProjectGuid>
+		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>true</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>false</UseDebugLibraries>
+		<PlatformToolset>v142</PlatformToolset>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<CharacterSet>MultiByte</CharacterSet>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="PropertySheets">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<Import Project="../toml++.props" />
+	<ItemDefinitionGroup>
+		<ClCompile>
+			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<ExceptionHandling>Sync</ExceptionHandling>
+			<PrecompiledHeader>Use</PrecompiledHeader>
+			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
+			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<LanguageStandard>stdcpp17</LanguageStandard>
+		</ClCompile>
+	</ItemDefinitionGroup>
+	<PropertyGroup>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
+	</PropertyGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
+			<PrecompiledHeader>Create</PrecompiledHeader>
+		</ClCompile>
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
+	</ItemGroup>
+	<ItemGroup>
+		<Natvis Include="..\toml++.natvis" />
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="..\..\tests\meson.build" />
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

vs/tests/test_release_x64.vcxproj

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="Debug|x64">
-			<Configuration>Debug</Configuration>
-			<Platform>x64</Platform>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Release|x64">
 			<Configuration>Release</Configuration>
 			<Platform>x64</Platform>
@@ -12,7 +8,7 @@
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<VCProjectVersion>16.0</VCProjectVersion>
-		<ProjectGuid>{3227B3DB-D203-5485-98B4-0F3021AFB869}</ProjectGuid>
+		<ProjectGuid>{F70977E7-E735-5D5C-9043-CA792F1B9392}</ProjectGuid>
 		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -34,7 +30,7 @@
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
 			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<Import Project="toml++.props" />
+	<Import Project="../toml++.props" />
 	<ItemDefinitionGroup>
 		<ClCompile>
 			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -43,57 +39,59 @@
 			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
 			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<LanguageStandard>stdcpp17</LanguageStandard>
 		</ClCompile>
 	</ItemDefinitionGroup>
 	<PropertyGroup>
-		<LocalDebuggerWorkingDirectory>..\tests\</LocalDebuggerWorkingDirectory>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
 	</PropertyGroup>
 	<ItemGroup>
-		<ClCompile Include="..\tests\conformance_burntsushi_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_burntsushi_valid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_valid.cpp" />
-		<ClCompile Include="..\tests\impl_catch2.cpp">
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\impl_toml.cpp">
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\manipulating_arrays.cpp" />
-		<ClCompile Include="..\tests\manipulating_tables.cpp" />
-		<ClCompile Include="..\tests\manipulating_parse_result.cpp" />
-		<ClCompile Include="..\tests\manipulating_values.cpp" />
-		<ClCompile Include="..\tests\parsing_arrays.cpp" />
-		<ClCompile Include="..\tests\parsing_booleans.cpp" />
-		<ClCompile Include="..\tests\parsing_comments.cpp" />
-		<ClCompile Include="..\tests\parsing_dates_and_times.cpp" />
-		<ClCompile Include="..\tests\parsing_floats.cpp" />
-		<ClCompile Include="..\tests\parsing_integers.cpp" />
-		<ClCompile Include="..\tests\parsing_key_value_pairs.cpp" />
-		<ClCompile Include="..\tests\parsing_spec_example.cpp" />
-		<ClCompile Include="..\tests\parsing_strings.cpp" />
-		<ClCompile Include="..\tests\parsing_tables.cpp" />
-		<ClCompile Include="..\tests\tests.cpp">
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
 			<PrecompiledHeader>Create</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\unicode.cpp" />
-		<ClCompile Include="..\tests\unicode_generated.cpp" />
-		<ClCompile Include="..\tests\windows_compat.cpp" />
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
 	</ItemGroup>
 	<ItemGroup>
-		<Natvis Include="toml++.natvis" />
+		<Natvis Include="..\toml++.natvis" />
 	</ItemGroup>
 	<ItemGroup>
-		<ClInclude Include="..\tests\catch2.h" />
-		<ClInclude Include="..\tests\evil_macros.h" />
-		<ClInclude Include="..\tests\settings.h" />
-		<ClInclude Include="..\tests\tests.h" />
-		<ClInclude Include="..\tests\tloptional.h" />
-		<ClInclude Include="..\tests\unicode.h" />
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
 	</ItemGroup>
 	<ItemGroup>
-		<None Include="..\tests\meson.build" />
+		<None Include="..\..\tests\meson.build" />
 	</ItemGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

vs/tests/test_release_x64_cpplatest.vcxproj

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="Debug|x64">
-			<Configuration>Debug</Configuration>
-			<Platform>x64</Platform>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Release|x64">
 			<Configuration>Release</Configuration>
 			<Platform>x64</Platform>
@@ -12,7 +8,7 @@
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<VCProjectVersion>16.0</VCProjectVersion>
-		<ProjectGuid>{B715E5E8-EC46-5ED6-87A7-C85CAB294888}</ProjectGuid>
+		<ProjectGuid>{413BDA52-0A9D-56B8-9AF3-A65019F42831}</ProjectGuid>
 		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -34,7 +30,7 @@
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
 			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<Import Project="toml++.props" />
+	<Import Project="../toml++.props" />
 	<ItemDefinitionGroup>
 		<ClCompile>
 			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -43,57 +39,59 @@
 			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
 			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<LanguageStandard>stdcpplatest</LanguageStandard>
 		</ClCompile>
 	</ItemDefinitionGroup>
 	<PropertyGroup>
-		<LocalDebuggerWorkingDirectory>..\tests\</LocalDebuggerWorkingDirectory>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
 	</PropertyGroup>
 	<ItemGroup>
-		<ClCompile Include="..\tests\conformance_burntsushi_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_burntsushi_valid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_valid.cpp" />
-		<ClCompile Include="..\tests\impl_catch2.cpp">
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\impl_toml.cpp">
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\manipulating_arrays.cpp" />
-		<ClCompile Include="..\tests\manipulating_tables.cpp" />
-		<ClCompile Include="..\tests\manipulating_parse_result.cpp" />
-		<ClCompile Include="..\tests\manipulating_values.cpp" />
-		<ClCompile Include="..\tests\parsing_arrays.cpp" />
-		<ClCompile Include="..\tests\parsing_booleans.cpp" />
-		<ClCompile Include="..\tests\parsing_comments.cpp" />
-		<ClCompile Include="..\tests\parsing_dates_and_times.cpp" />
-		<ClCompile Include="..\tests\parsing_floats.cpp" />
-		<ClCompile Include="..\tests\parsing_integers.cpp" />
-		<ClCompile Include="..\tests\parsing_key_value_pairs.cpp" />
-		<ClCompile Include="..\tests\parsing_spec_example.cpp" />
-		<ClCompile Include="..\tests\parsing_strings.cpp" />
-		<ClCompile Include="..\tests\parsing_tables.cpp" />
-		<ClCompile Include="..\tests\tests.cpp">
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
 			<PrecompiledHeader>Create</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\unicode.cpp" />
-		<ClCompile Include="..\tests\unicode_generated.cpp" />
-		<ClCompile Include="..\tests\windows_compat.cpp" />
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
 	</ItemGroup>
 	<ItemGroup>
-		<Natvis Include="toml++.natvis" />
+		<Natvis Include="..\toml++.natvis" />
 	</ItemGroup>
 	<ItemGroup>
-		<ClInclude Include="..\tests\catch2.h" />
-		<ClInclude Include="..\tests\evil_macros.h" />
-		<ClInclude Include="..\tests\settings.h" />
-		<ClInclude Include="..\tests\tests.h" />
-		<ClInclude Include="..\tests\tloptional.h" />
-		<ClInclude Include="..\tests\unicode.h" />
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
 	</ItemGroup>
 	<ItemGroup>
-		<None Include="..\tests\meson.build" />
+		<None Include="..\..\tests\meson.build" />
 	</ItemGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

vs/tests/test_release_x64_cpplatest_noexcept.vcxproj

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="Debug|x64">
-			<Configuration>Debug</Configuration>
-			<Platform>x64</Platform>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Release|x64">
 			<Configuration>Release</Configuration>
 			<Platform>x64</Platform>
@@ -12,7 +8,7 @@
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<VCProjectVersion>16.0</VCProjectVersion>
-		<ProjectGuid>{DFA3136B-CE2F-5E5F-80FC-D395F3D72180}</ProjectGuid>
+		<ProjectGuid>{6F6D8031-4BA9-5F07-BE1F-190A2FC3CC9C}</ProjectGuid>
 		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -34,7 +30,7 @@
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
 			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<Import Project="toml++.props" />
+	<Import Project="../toml++.props" />
 	<ItemDefinitionGroup>
 		<ClCompile>
 			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -43,57 +39,59 @@
 			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
 			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<LanguageStandard>stdcpplatest</LanguageStandard>
 		</ClCompile>
 	</ItemDefinitionGroup>
 	<PropertyGroup>
-		<LocalDebuggerWorkingDirectory>..\tests\</LocalDebuggerWorkingDirectory>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
 	</PropertyGroup>
 	<ItemGroup>
-		<ClCompile Include="..\tests\conformance_burntsushi_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_burntsushi_valid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_valid.cpp" />
-		<ClCompile Include="..\tests\impl_catch2.cpp">
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\impl_toml.cpp">
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\manipulating_arrays.cpp" />
-		<ClCompile Include="..\tests\manipulating_tables.cpp" />
-		<ClCompile Include="..\tests\manipulating_parse_result.cpp" />
-		<ClCompile Include="..\tests\manipulating_values.cpp" />
-		<ClCompile Include="..\tests\parsing_arrays.cpp" />
-		<ClCompile Include="..\tests\parsing_booleans.cpp" />
-		<ClCompile Include="..\tests\parsing_comments.cpp" />
-		<ClCompile Include="..\tests\parsing_dates_and_times.cpp" />
-		<ClCompile Include="..\tests\parsing_floats.cpp" />
-		<ClCompile Include="..\tests\parsing_integers.cpp" />
-		<ClCompile Include="..\tests\parsing_key_value_pairs.cpp" />
-		<ClCompile Include="..\tests\parsing_spec_example.cpp" />
-		<ClCompile Include="..\tests\parsing_strings.cpp" />
-		<ClCompile Include="..\tests\parsing_tables.cpp" />
-		<ClCompile Include="..\tests\tests.cpp">
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
 			<PrecompiledHeader>Create</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\unicode.cpp" />
-		<ClCompile Include="..\tests\unicode_generated.cpp" />
-		<ClCompile Include="..\tests\windows_compat.cpp" />
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
 	</ItemGroup>
 	<ItemGroup>
-		<Natvis Include="toml++.natvis" />
+		<Natvis Include="..\toml++.natvis" />
 	</ItemGroup>
 	<ItemGroup>
-		<ClInclude Include="..\tests\catch2.h" />
-		<ClInclude Include="..\tests\evil_macros.h" />
-		<ClInclude Include="..\tests\settings.h" />
-		<ClInclude Include="..\tests\tests.h" />
-		<ClInclude Include="..\tests\tloptional.h" />
-		<ClInclude Include="..\tests\unicode.h" />
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
 	</ItemGroup>
 	<ItemGroup>
-		<None Include="..\tests\meson.build" />
+		<None Include="..\..\tests\meson.build" />
 	</ItemGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

vs/tests/test_release_x64_cpplatest_noexcept_unrel.vcxproj

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="Debug|x64">
-			<Configuration>Debug</Configuration>
-			<Platform>x64</Platform>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Release|x64">
 			<Configuration>Release</Configuration>
 			<Platform>x64</Platform>
@@ -12,7 +8,7 @@
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<VCProjectVersion>16.0</VCProjectVersion>
-		<ProjectGuid>{F301F5EB-C33D-5BF2-BAAF-531F28AB3A49}</ProjectGuid>
+		<ProjectGuid>{18ADA45A-11DD-5649-8492-F726E6A82803}</ProjectGuid>
 		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -34,7 +30,7 @@
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
 			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<Import Project="toml++.props" />
+	<Import Project="../toml++.props" />
 	<ItemDefinitionGroup>
 		<ClCompile>
 			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -43,57 +39,59 @@
 			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
 			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<LanguageStandard>stdcpplatest</LanguageStandard>
 		</ClCompile>
 	</ItemDefinitionGroup>
 	<PropertyGroup>
-		<LocalDebuggerWorkingDirectory>..\tests\</LocalDebuggerWorkingDirectory>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
 	</PropertyGroup>
 	<ItemGroup>
-		<ClCompile Include="..\tests\conformance_burntsushi_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_burntsushi_valid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_valid.cpp" />
-		<ClCompile Include="..\tests\impl_catch2.cpp">
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\impl_toml.cpp">
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\manipulating_arrays.cpp" />
-		<ClCompile Include="..\tests\manipulating_tables.cpp" />
-		<ClCompile Include="..\tests\manipulating_parse_result.cpp" />
-		<ClCompile Include="..\tests\manipulating_values.cpp" />
-		<ClCompile Include="..\tests\parsing_arrays.cpp" />
-		<ClCompile Include="..\tests\parsing_booleans.cpp" />
-		<ClCompile Include="..\tests\parsing_comments.cpp" />
-		<ClCompile Include="..\tests\parsing_dates_and_times.cpp" />
-		<ClCompile Include="..\tests\parsing_floats.cpp" />
-		<ClCompile Include="..\tests\parsing_integers.cpp" />
-		<ClCompile Include="..\tests\parsing_key_value_pairs.cpp" />
-		<ClCompile Include="..\tests\parsing_spec_example.cpp" />
-		<ClCompile Include="..\tests\parsing_strings.cpp" />
-		<ClCompile Include="..\tests\parsing_tables.cpp" />
-		<ClCompile Include="..\tests\tests.cpp">
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
 			<PrecompiledHeader>Create</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\unicode.cpp" />
-		<ClCompile Include="..\tests\unicode_generated.cpp" />
-		<ClCompile Include="..\tests\windows_compat.cpp" />
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
 	</ItemGroup>
 	<ItemGroup>
-		<Natvis Include="toml++.natvis" />
+		<Natvis Include="..\toml++.natvis" />
 	</ItemGroup>
 	<ItemGroup>
-		<ClInclude Include="..\tests\catch2.h" />
-		<ClInclude Include="..\tests\evil_macros.h" />
-		<ClInclude Include="..\tests\settings.h" />
-		<ClInclude Include="..\tests\tests.h" />
-		<ClInclude Include="..\tests\tloptional.h" />
-		<ClInclude Include="..\tests\unicode.h" />
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
 	</ItemGroup>
 	<ItemGroup>
-		<None Include="..\tests\meson.build" />
+		<None Include="..\..\tests\meson.build" />
 	</ItemGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

vs/tests/test_release_x64_cpplatest_unrel.vcxproj

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="Debug|x64">
-			<Configuration>Debug</Configuration>
-			<Platform>x64</Platform>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Release|x64">
 			<Configuration>Release</Configuration>
 			<Platform>x64</Platform>
@@ -12,7 +8,7 @@
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<VCProjectVersion>16.0</VCProjectVersion>
-		<ProjectGuid>{913FC307-267A-5D14-B00A-7721371AD4E2}</ProjectGuid>
+		<ProjectGuid>{74813AFD-DB22-52FA-9108-0BADD4B0E161}</ProjectGuid>
 		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -34,7 +30,7 @@
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
 			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<Import Project="toml++.props" />
+	<Import Project="../toml++.props" />
 	<ItemDefinitionGroup>
 		<ClCompile>
 			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -43,57 +39,59 @@
 			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
 			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<LanguageStandard>stdcpplatest</LanguageStandard>
 		</ClCompile>
 	</ItemDefinitionGroup>
 	<PropertyGroup>
-		<LocalDebuggerWorkingDirectory>..\tests\</LocalDebuggerWorkingDirectory>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
 	</PropertyGroup>
 	<ItemGroup>
-		<ClCompile Include="..\tests\conformance_burntsushi_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_burntsushi_valid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_valid.cpp" />
-		<ClCompile Include="..\tests\impl_catch2.cpp">
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\impl_toml.cpp">
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\manipulating_arrays.cpp" />
-		<ClCompile Include="..\tests\manipulating_tables.cpp" />
-		<ClCompile Include="..\tests\manipulating_parse_result.cpp" />
-		<ClCompile Include="..\tests\manipulating_values.cpp" />
-		<ClCompile Include="..\tests\parsing_arrays.cpp" />
-		<ClCompile Include="..\tests\parsing_booleans.cpp" />
-		<ClCompile Include="..\tests\parsing_comments.cpp" />
-		<ClCompile Include="..\tests\parsing_dates_and_times.cpp" />
-		<ClCompile Include="..\tests\parsing_floats.cpp" />
-		<ClCompile Include="..\tests\parsing_integers.cpp" />
-		<ClCompile Include="..\tests\parsing_key_value_pairs.cpp" />
-		<ClCompile Include="..\tests\parsing_spec_example.cpp" />
-		<ClCompile Include="..\tests\parsing_strings.cpp" />
-		<ClCompile Include="..\tests\parsing_tables.cpp" />
-		<ClCompile Include="..\tests\tests.cpp">
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
 			<PrecompiledHeader>Create</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\unicode.cpp" />
-		<ClCompile Include="..\tests\unicode_generated.cpp" />
-		<ClCompile Include="..\tests\windows_compat.cpp" />
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
 	</ItemGroup>
 	<ItemGroup>
-		<Natvis Include="toml++.natvis" />
+		<Natvis Include="..\toml++.natvis" />
 	</ItemGroup>
 	<ItemGroup>
-		<ClInclude Include="..\tests\catch2.h" />
-		<ClInclude Include="..\tests\evil_macros.h" />
-		<ClInclude Include="..\tests\settings.h" />
-		<ClInclude Include="..\tests\tests.h" />
-		<ClInclude Include="..\tests\tloptional.h" />
-		<ClInclude Include="..\tests\unicode.h" />
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
 	</ItemGroup>
 	<ItemGroup>
-		<None Include="..\tests\meson.build" />
+		<None Include="..\..\tests\meson.build" />
 	</ItemGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

vs/tests/test_release_x64_noexcept.vcxproj

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="Debug|x64">
-			<Configuration>Debug</Configuration>
-			<Platform>x64</Platform>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Release|x64">
 			<Configuration>Release</Configuration>
 			<Platform>x64</Platform>
@@ -12,7 +8,7 @@
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<VCProjectVersion>16.0</VCProjectVersion>
-		<ProjectGuid>{B51CFAB1-00F6-5EC0-B6E5-625D40631518}</ProjectGuid>
+		<ProjectGuid>{B1B28D93-892C-59BF-9C6F-D813EC6438A0}</ProjectGuid>
 		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -34,7 +30,7 @@
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
 			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<Import Project="toml++.props" />
+	<Import Project="../toml++.props" />
 	<ItemDefinitionGroup>
 		<ClCompile>
 			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -43,57 +39,59 @@
 			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
 			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<LanguageStandard>stdcpp17</LanguageStandard>
 		</ClCompile>
 	</ItemDefinitionGroup>
 	<PropertyGroup>
-		<LocalDebuggerWorkingDirectory>..\tests\</LocalDebuggerWorkingDirectory>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
 	</PropertyGroup>
 	<ItemGroup>
-		<ClCompile Include="..\tests\conformance_burntsushi_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_burntsushi_valid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_valid.cpp" />
-		<ClCompile Include="..\tests\impl_catch2.cpp">
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\impl_toml.cpp">
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\manipulating_arrays.cpp" />
-		<ClCompile Include="..\tests\manipulating_tables.cpp" />
-		<ClCompile Include="..\tests\manipulating_parse_result.cpp" />
-		<ClCompile Include="..\tests\manipulating_values.cpp" />
-		<ClCompile Include="..\tests\parsing_arrays.cpp" />
-		<ClCompile Include="..\tests\parsing_booleans.cpp" />
-		<ClCompile Include="..\tests\parsing_comments.cpp" />
-		<ClCompile Include="..\tests\parsing_dates_and_times.cpp" />
-		<ClCompile Include="..\tests\parsing_floats.cpp" />
-		<ClCompile Include="..\tests\parsing_integers.cpp" />
-		<ClCompile Include="..\tests\parsing_key_value_pairs.cpp" />
-		<ClCompile Include="..\tests\parsing_spec_example.cpp" />
-		<ClCompile Include="..\tests\parsing_strings.cpp" />
-		<ClCompile Include="..\tests\parsing_tables.cpp" />
-		<ClCompile Include="..\tests\tests.cpp">
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
 			<PrecompiledHeader>Create</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\unicode.cpp" />
-		<ClCompile Include="..\tests\unicode_generated.cpp" />
-		<ClCompile Include="..\tests\windows_compat.cpp" />
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
 	</ItemGroup>
 	<ItemGroup>
-		<Natvis Include="toml++.natvis" />
+		<Natvis Include="..\toml++.natvis" />
 	</ItemGroup>
 	<ItemGroup>
-		<ClInclude Include="..\tests\catch2.h" />
-		<ClInclude Include="..\tests\evil_macros.h" />
-		<ClInclude Include="..\tests\settings.h" />
-		<ClInclude Include="..\tests\tests.h" />
-		<ClInclude Include="..\tests\tloptional.h" />
-		<ClInclude Include="..\tests\unicode.h" />
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
 	</ItemGroup>
 	<ItemGroup>
-		<None Include="..\tests\meson.build" />
+		<None Include="..\..\tests\meson.build" />
 	</ItemGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

vs/tests/test_release_x64_noexcept_unrel.vcxproj

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="Debug|x64">
-			<Configuration>Debug</Configuration>
-			<Platform>x64</Platform>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Release|x64">
 			<Configuration>Release</Configuration>
 			<Platform>x64</Platform>
@@ -12,7 +8,7 @@
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<VCProjectVersion>16.0</VCProjectVersion>
-		<ProjectGuid>{3C57D63F-BD2A-5D8D-A2DF-8A94799343F7}</ProjectGuid>
+		<ProjectGuid>{6C3EA8CD-33CC-5775-ACC4-631FF5FE1E2C}</ProjectGuid>
 		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -34,7 +30,7 @@
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
 			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<Import Project="toml++.props" />
+	<Import Project="../toml++.props" />
 	<ItemDefinitionGroup>
 		<ClCompile>
 			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -43,57 +39,59 @@
 			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
 			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<LanguageStandard>stdcpp17</LanguageStandard>
 		</ClCompile>
 	</ItemDefinitionGroup>
 	<PropertyGroup>
-		<LocalDebuggerWorkingDirectory>..\tests\</LocalDebuggerWorkingDirectory>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
 	</PropertyGroup>
 	<ItemGroup>
-		<ClCompile Include="..\tests\conformance_burntsushi_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_burntsushi_valid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_valid.cpp" />
-		<ClCompile Include="..\tests\impl_catch2.cpp">
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\impl_toml.cpp">
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\manipulating_arrays.cpp" />
-		<ClCompile Include="..\tests\manipulating_tables.cpp" />
-		<ClCompile Include="..\tests\manipulating_parse_result.cpp" />
-		<ClCompile Include="..\tests\manipulating_values.cpp" />
-		<ClCompile Include="..\tests\parsing_arrays.cpp" />
-		<ClCompile Include="..\tests\parsing_booleans.cpp" />
-		<ClCompile Include="..\tests\parsing_comments.cpp" />
-		<ClCompile Include="..\tests\parsing_dates_and_times.cpp" />
-		<ClCompile Include="..\tests\parsing_floats.cpp" />
-		<ClCompile Include="..\tests\parsing_integers.cpp" />
-		<ClCompile Include="..\tests\parsing_key_value_pairs.cpp" />
-		<ClCompile Include="..\tests\parsing_spec_example.cpp" />
-		<ClCompile Include="..\tests\parsing_strings.cpp" />
-		<ClCompile Include="..\tests\parsing_tables.cpp" />
-		<ClCompile Include="..\tests\tests.cpp">
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
 			<PrecompiledHeader>Create</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\unicode.cpp" />
-		<ClCompile Include="..\tests\unicode_generated.cpp" />
-		<ClCompile Include="..\tests\windows_compat.cpp" />
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
 	</ItemGroup>
 	<ItemGroup>
-		<Natvis Include="toml++.natvis" />
+		<Natvis Include="..\toml++.natvis" />
 	</ItemGroup>
 	<ItemGroup>
-		<ClInclude Include="..\tests\catch2.h" />
-		<ClInclude Include="..\tests\evil_macros.h" />
-		<ClInclude Include="..\tests\settings.h" />
-		<ClInclude Include="..\tests\tests.h" />
-		<ClInclude Include="..\tests\tloptional.h" />
-		<ClInclude Include="..\tests\unicode.h" />
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
 	</ItemGroup>
 	<ItemGroup>
-		<None Include="..\tests\meson.build" />
+		<None Include="..\..\tests\meson.build" />
 	</ItemGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

vs/tests/test_release_x64_unrel.vcxproj

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="Debug|x64">
-			<Configuration>Debug</Configuration>
-			<Platform>x64</Platform>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Release|x64">
 			<Configuration>Release</Configuration>
 			<Platform>x64</Platform>
@@ -12,7 +8,7 @@
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<VCProjectVersion>16.0</VCProjectVersion>
-		<ProjectGuid>{902B7939-6FD3-5819-97A6-E23AE3675834}</ProjectGuid>
+		<ProjectGuid>{B3779AEA-40D6-5F3C-BC86-98E4E577E09D}</ProjectGuid>
 		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -34,7 +30,7 @@
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
 			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<Import Project="toml++.props" />
+	<Import Project="../toml++.props" />
 	<ItemDefinitionGroup>
 		<ClCompile>
 			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -43,57 +39,59 @@
 			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
 			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<LanguageStandard>stdcpp17</LanguageStandard>
 		</ClCompile>
 	</ItemDefinitionGroup>
 	<PropertyGroup>
-		<LocalDebuggerWorkingDirectory>..\tests\</LocalDebuggerWorkingDirectory>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
 	</PropertyGroup>
 	<ItemGroup>
-		<ClCompile Include="..\tests\conformance_burntsushi_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_burntsushi_valid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_valid.cpp" />
-		<ClCompile Include="..\tests\impl_catch2.cpp">
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\impl_toml.cpp">
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\manipulating_arrays.cpp" />
-		<ClCompile Include="..\tests\manipulating_tables.cpp" />
-		<ClCompile Include="..\tests\manipulating_parse_result.cpp" />
-		<ClCompile Include="..\tests\manipulating_values.cpp" />
-		<ClCompile Include="..\tests\parsing_arrays.cpp" />
-		<ClCompile Include="..\tests\parsing_booleans.cpp" />
-		<ClCompile Include="..\tests\parsing_comments.cpp" />
-		<ClCompile Include="..\tests\parsing_dates_and_times.cpp" />
-		<ClCompile Include="..\tests\parsing_floats.cpp" />
-		<ClCompile Include="..\tests\parsing_integers.cpp" />
-		<ClCompile Include="..\tests\parsing_key_value_pairs.cpp" />
-		<ClCompile Include="..\tests\parsing_spec_example.cpp" />
-		<ClCompile Include="..\tests\parsing_strings.cpp" />
-		<ClCompile Include="..\tests\parsing_tables.cpp" />
-		<ClCompile Include="..\tests\tests.cpp">
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
 			<PrecompiledHeader>Create</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\unicode.cpp" />
-		<ClCompile Include="..\tests\unicode_generated.cpp" />
-		<ClCompile Include="..\tests\windows_compat.cpp" />
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
 	</ItemGroup>
 	<ItemGroup>
-		<Natvis Include="toml++.natvis" />
+		<Natvis Include="..\toml++.natvis" />
 	</ItemGroup>
 	<ItemGroup>
-		<ClInclude Include="..\tests\catch2.h" />
-		<ClInclude Include="..\tests\evil_macros.h" />
-		<ClInclude Include="..\tests\settings.h" />
-		<ClInclude Include="..\tests\tests.h" />
-		<ClInclude Include="..\tests\tloptional.h" />
-		<ClInclude Include="..\tests\unicode.h" />
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
 	</ItemGroup>
 	<ItemGroup>
-		<None Include="..\tests\meson.build" />
+		<None Include="..\..\tests\meson.build" />
 	</ItemGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

vs/tests/test_release_x86.vcxproj

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="Debug|Win32">
-			<Configuration>Debug</Configuration>
-			<Platform>Win32</Platform>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Release|Win32">
 			<Configuration>Release</Configuration>
 			<Platform>Win32</Platform>
@@ -12,7 +8,7 @@
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<VCProjectVersion>16.0</VCProjectVersion>
-		<ProjectGuid>{8E878D65-5FB5-5E31-B389-A83E040C49EA}</ProjectGuid>
+		<ProjectGuid>{2D7D2E84-8861-529C-9C05-A1EE1FB84084}</ProjectGuid>
 		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -34,7 +30,7 @@
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
 			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<Import Project="toml++.props" />
+	<Import Project="../toml++.props" />
 	<ItemDefinitionGroup>
 		<ClCompile>
 			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -43,57 +39,59 @@
 			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
 			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<LanguageStandard>stdcpp17</LanguageStandard>
 		</ClCompile>
 	</ItemDefinitionGroup>
 	<PropertyGroup>
-		<LocalDebuggerWorkingDirectory>..\tests\</LocalDebuggerWorkingDirectory>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
 	</PropertyGroup>
 	<ItemGroup>
-		<ClCompile Include="..\tests\conformance_burntsushi_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_burntsushi_valid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_valid.cpp" />
-		<ClCompile Include="..\tests\impl_catch2.cpp">
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\impl_toml.cpp">
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\manipulating_arrays.cpp" />
-		<ClCompile Include="..\tests\manipulating_tables.cpp" />
-		<ClCompile Include="..\tests\manipulating_parse_result.cpp" />
-		<ClCompile Include="..\tests\manipulating_values.cpp" />
-		<ClCompile Include="..\tests\parsing_arrays.cpp" />
-		<ClCompile Include="..\tests\parsing_booleans.cpp" />
-		<ClCompile Include="..\tests\parsing_comments.cpp" />
-		<ClCompile Include="..\tests\parsing_dates_and_times.cpp" />
-		<ClCompile Include="..\tests\parsing_floats.cpp" />
-		<ClCompile Include="..\tests\parsing_integers.cpp" />
-		<ClCompile Include="..\tests\parsing_key_value_pairs.cpp" />
-		<ClCompile Include="..\tests\parsing_spec_example.cpp" />
-		<ClCompile Include="..\tests\parsing_strings.cpp" />
-		<ClCompile Include="..\tests\parsing_tables.cpp" />
-		<ClCompile Include="..\tests\tests.cpp">
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
 			<PrecompiledHeader>Create</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\unicode.cpp" />
-		<ClCompile Include="..\tests\unicode_generated.cpp" />
-		<ClCompile Include="..\tests\windows_compat.cpp" />
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
 	</ItemGroup>
 	<ItemGroup>
-		<Natvis Include="toml++.natvis" />
+		<Natvis Include="..\toml++.natvis" />
 	</ItemGroup>
 	<ItemGroup>
-		<ClInclude Include="..\tests\catch2.h" />
-		<ClInclude Include="..\tests\evil_macros.h" />
-		<ClInclude Include="..\tests\settings.h" />
-		<ClInclude Include="..\tests\tests.h" />
-		<ClInclude Include="..\tests\tloptional.h" />
-		<ClInclude Include="..\tests\unicode.h" />
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
 	</ItemGroup>
 	<ItemGroup>
-		<None Include="..\tests\meson.build" />
+		<None Include="..\..\tests\meson.build" />
 	</ItemGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

vs/tests/test_release_x86_cpplatest.vcxproj

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="Debug|Win32">
-			<Configuration>Debug</Configuration>
-			<Platform>Win32</Platform>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Release|Win32">
 			<Configuration>Release</Configuration>
 			<Platform>Win32</Platform>
@@ -12,7 +8,7 @@
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<VCProjectVersion>16.0</VCProjectVersion>
-		<ProjectGuid>{55D063AA-8120-5F31-9A9B-9EAAB910FBCE}</ProjectGuid>
+		<ProjectGuid>{B98D8D10-4B7B-5AA8-84B5-87FE6AA80C10}</ProjectGuid>
 		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -34,7 +30,7 @@
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
 			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<Import Project="toml++.props" />
+	<Import Project="../toml++.props" />
 	<ItemDefinitionGroup>
 		<ClCompile>
 			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -43,57 +39,59 @@
 			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
 			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<LanguageStandard>stdcpplatest</LanguageStandard>
 		</ClCompile>
 	</ItemDefinitionGroup>
 	<PropertyGroup>
-		<LocalDebuggerWorkingDirectory>..\tests\</LocalDebuggerWorkingDirectory>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
 	</PropertyGroup>
 	<ItemGroup>
-		<ClCompile Include="..\tests\conformance_burntsushi_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_burntsushi_valid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_valid.cpp" />
-		<ClCompile Include="..\tests\impl_catch2.cpp">
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\impl_toml.cpp">
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\manipulating_arrays.cpp" />
-		<ClCompile Include="..\tests\manipulating_tables.cpp" />
-		<ClCompile Include="..\tests\manipulating_parse_result.cpp" />
-		<ClCompile Include="..\tests\manipulating_values.cpp" />
-		<ClCompile Include="..\tests\parsing_arrays.cpp" />
-		<ClCompile Include="..\tests\parsing_booleans.cpp" />
-		<ClCompile Include="..\tests\parsing_comments.cpp" />
-		<ClCompile Include="..\tests\parsing_dates_and_times.cpp" />
-		<ClCompile Include="..\tests\parsing_floats.cpp" />
-		<ClCompile Include="..\tests\parsing_integers.cpp" />
-		<ClCompile Include="..\tests\parsing_key_value_pairs.cpp" />
-		<ClCompile Include="..\tests\parsing_spec_example.cpp" />
-		<ClCompile Include="..\tests\parsing_strings.cpp" />
-		<ClCompile Include="..\tests\parsing_tables.cpp" />
-		<ClCompile Include="..\tests\tests.cpp">
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
 			<PrecompiledHeader>Create</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\unicode.cpp" />
-		<ClCompile Include="..\tests\unicode_generated.cpp" />
-		<ClCompile Include="..\tests\windows_compat.cpp" />
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
 	</ItemGroup>
 	<ItemGroup>
-		<Natvis Include="toml++.natvis" />
+		<Natvis Include="..\toml++.natvis" />
 	</ItemGroup>
 	<ItemGroup>
-		<ClInclude Include="..\tests\catch2.h" />
-		<ClInclude Include="..\tests\evil_macros.h" />
-		<ClInclude Include="..\tests\settings.h" />
-		<ClInclude Include="..\tests\tests.h" />
-		<ClInclude Include="..\tests\tloptional.h" />
-		<ClInclude Include="..\tests\unicode.h" />
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
 	</ItemGroup>
 	<ItemGroup>
-		<None Include="..\tests\meson.build" />
+		<None Include="..\..\tests\meson.build" />
 	</ItemGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

vs/tests/test_release_x86_cpplatest_noexcept.vcxproj

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="Debug|Win32">
-			<Configuration>Debug</Configuration>
-			<Platform>Win32</Platform>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Release|Win32">
 			<Configuration>Release</Configuration>
 			<Platform>Win32</Platform>
@@ -12,7 +8,7 @@
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<VCProjectVersion>16.0</VCProjectVersion>
-		<ProjectGuid>{EB4C03FC-1CDE-5062-81DE-5948B382F85A}</ProjectGuid>
+		<ProjectGuid>{C9D50E23-65F2-5C1E-BE44-7327A9FFC637}</ProjectGuid>
 		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -34,7 +30,7 @@
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
 			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<Import Project="toml++.props" />
+	<Import Project="../toml++.props" />
 	<ItemDefinitionGroup>
 		<ClCompile>
 			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -43,57 +39,59 @@
 			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
 			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<LanguageStandard>stdcpplatest</LanguageStandard>
 		</ClCompile>
 	</ItemDefinitionGroup>
 	<PropertyGroup>
-		<LocalDebuggerWorkingDirectory>..\tests\</LocalDebuggerWorkingDirectory>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
 	</PropertyGroup>
 	<ItemGroup>
-		<ClCompile Include="..\tests\conformance_burntsushi_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_burntsushi_valid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_valid.cpp" />
-		<ClCompile Include="..\tests\impl_catch2.cpp">
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\impl_toml.cpp">
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\manipulating_arrays.cpp" />
-		<ClCompile Include="..\tests\manipulating_tables.cpp" />
-		<ClCompile Include="..\tests\manipulating_parse_result.cpp" />
-		<ClCompile Include="..\tests\manipulating_values.cpp" />
-		<ClCompile Include="..\tests\parsing_arrays.cpp" />
-		<ClCompile Include="..\tests\parsing_booleans.cpp" />
-		<ClCompile Include="..\tests\parsing_comments.cpp" />
-		<ClCompile Include="..\tests\parsing_dates_and_times.cpp" />
-		<ClCompile Include="..\tests\parsing_floats.cpp" />
-		<ClCompile Include="..\tests\parsing_integers.cpp" />
-		<ClCompile Include="..\tests\parsing_key_value_pairs.cpp" />
-		<ClCompile Include="..\tests\parsing_spec_example.cpp" />
-		<ClCompile Include="..\tests\parsing_strings.cpp" />
-		<ClCompile Include="..\tests\parsing_tables.cpp" />
-		<ClCompile Include="..\tests\tests.cpp">
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
 			<PrecompiledHeader>Create</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\unicode.cpp" />
-		<ClCompile Include="..\tests\unicode_generated.cpp" />
-		<ClCompile Include="..\tests\windows_compat.cpp" />
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
 	</ItemGroup>
 	<ItemGroup>
-		<Natvis Include="toml++.natvis" />
+		<Natvis Include="..\toml++.natvis" />
 	</ItemGroup>
 	<ItemGroup>
-		<ClInclude Include="..\tests\catch2.h" />
-		<ClInclude Include="..\tests\evil_macros.h" />
-		<ClInclude Include="..\tests\settings.h" />
-		<ClInclude Include="..\tests\tests.h" />
-		<ClInclude Include="..\tests\tloptional.h" />
-		<ClInclude Include="..\tests\unicode.h" />
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
 	</ItemGroup>
 	<ItemGroup>
-		<None Include="..\tests\meson.build" />
+		<None Include="..\..\tests\meson.build" />
 	</ItemGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

vs/tests/test_release_x86_cpplatest_noexcept_unrel.vcxproj

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="Debug|Win32">
-			<Configuration>Debug</Configuration>
-			<Platform>Win32</Platform>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Release|Win32">
 			<Configuration>Release</Configuration>
 			<Platform>Win32</Platform>
@@ -12,7 +8,7 @@
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<VCProjectVersion>16.0</VCProjectVersion>
-		<ProjectGuid>{0C46DDD5-781E-51B8-8057-1C82FFE1D96F}</ProjectGuid>
+		<ProjectGuid>{082D6FBD-F01E-504B-9905-25937CCE7F9A}</ProjectGuid>
 		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -34,7 +30,7 @@
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
 			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<Import Project="toml++.props" />
+	<Import Project="../toml++.props" />
 	<ItemDefinitionGroup>
 		<ClCompile>
 			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -43,57 +39,59 @@
 			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
 			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<LanguageStandard>stdcpplatest</LanguageStandard>
 		</ClCompile>
 	</ItemDefinitionGroup>
 	<PropertyGroup>
-		<LocalDebuggerWorkingDirectory>..\tests\</LocalDebuggerWorkingDirectory>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
 	</PropertyGroup>
 	<ItemGroup>
-		<ClCompile Include="..\tests\conformance_burntsushi_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_burntsushi_valid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_valid.cpp" />
-		<ClCompile Include="..\tests\impl_catch2.cpp">
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\impl_toml.cpp">
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\manipulating_arrays.cpp" />
-		<ClCompile Include="..\tests\manipulating_tables.cpp" />
-		<ClCompile Include="..\tests\manipulating_parse_result.cpp" />
-		<ClCompile Include="..\tests\manipulating_values.cpp" />
-		<ClCompile Include="..\tests\parsing_arrays.cpp" />
-		<ClCompile Include="..\tests\parsing_booleans.cpp" />
-		<ClCompile Include="..\tests\parsing_comments.cpp" />
-		<ClCompile Include="..\tests\parsing_dates_and_times.cpp" />
-		<ClCompile Include="..\tests\parsing_floats.cpp" />
-		<ClCompile Include="..\tests\parsing_integers.cpp" />
-		<ClCompile Include="..\tests\parsing_key_value_pairs.cpp" />
-		<ClCompile Include="..\tests\parsing_spec_example.cpp" />
-		<ClCompile Include="..\tests\parsing_strings.cpp" />
-		<ClCompile Include="..\tests\parsing_tables.cpp" />
-		<ClCompile Include="..\tests\tests.cpp">
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
 			<PrecompiledHeader>Create</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\unicode.cpp" />
-		<ClCompile Include="..\tests\unicode_generated.cpp" />
-		<ClCompile Include="..\tests\windows_compat.cpp" />
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
 	</ItemGroup>
 	<ItemGroup>
-		<Natvis Include="toml++.natvis" />
+		<Natvis Include="..\toml++.natvis" />
 	</ItemGroup>
 	<ItemGroup>
-		<ClInclude Include="..\tests\catch2.h" />
-		<ClInclude Include="..\tests\evil_macros.h" />
-		<ClInclude Include="..\tests\settings.h" />
-		<ClInclude Include="..\tests\tests.h" />
-		<ClInclude Include="..\tests\tloptional.h" />
-		<ClInclude Include="..\tests\unicode.h" />
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
 	</ItemGroup>
 	<ItemGroup>
-		<None Include="..\tests\meson.build" />
+		<None Include="..\..\tests\meson.build" />
 	</ItemGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

vs/tests/test_release_x86_cpplatest_unrel.vcxproj

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="Debug|Win32">
-			<Configuration>Debug</Configuration>
-			<Platform>Win32</Platform>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Release|Win32">
 			<Configuration>Release</Configuration>
 			<Platform>Win32</Platform>
@@ -12,7 +8,7 @@
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<VCProjectVersion>16.0</VCProjectVersion>
-		<ProjectGuid>{955F593A-6BFC-57A3-9A34-5FE2F3F37ACA}</ProjectGuid>
+		<ProjectGuid>{AD2F4862-1DC2-550B-AFEF-FF3D4D477323}</ProjectGuid>
 		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -34,7 +30,7 @@
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
 			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<Import Project="toml++.props" />
+	<Import Project="../toml++.props" />
 	<ItemDefinitionGroup>
 		<ClCompile>
 			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -43,57 +39,59 @@
 			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
 			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<LanguageStandard>stdcpplatest</LanguageStandard>
 		</ClCompile>
 	</ItemDefinitionGroup>
 	<PropertyGroup>
-		<LocalDebuggerWorkingDirectory>..\tests\</LocalDebuggerWorkingDirectory>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
 	</PropertyGroup>
 	<ItemGroup>
-		<ClCompile Include="..\tests\conformance_burntsushi_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_burntsushi_valid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_valid.cpp" />
-		<ClCompile Include="..\tests\impl_catch2.cpp">
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\impl_toml.cpp">
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\manipulating_arrays.cpp" />
-		<ClCompile Include="..\tests\manipulating_tables.cpp" />
-		<ClCompile Include="..\tests\manipulating_parse_result.cpp" />
-		<ClCompile Include="..\tests\manipulating_values.cpp" />
-		<ClCompile Include="..\tests\parsing_arrays.cpp" />
-		<ClCompile Include="..\tests\parsing_booleans.cpp" />
-		<ClCompile Include="..\tests\parsing_comments.cpp" />
-		<ClCompile Include="..\tests\parsing_dates_and_times.cpp" />
-		<ClCompile Include="..\tests\parsing_floats.cpp" />
-		<ClCompile Include="..\tests\parsing_integers.cpp" />
-		<ClCompile Include="..\tests\parsing_key_value_pairs.cpp" />
-		<ClCompile Include="..\tests\parsing_spec_example.cpp" />
-		<ClCompile Include="..\tests\parsing_strings.cpp" />
-		<ClCompile Include="..\tests\parsing_tables.cpp" />
-		<ClCompile Include="..\tests\tests.cpp">
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
 			<PrecompiledHeader>Create</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\unicode.cpp" />
-		<ClCompile Include="..\tests\unicode_generated.cpp" />
-		<ClCompile Include="..\tests\windows_compat.cpp" />
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
 	</ItemGroup>
 	<ItemGroup>
-		<Natvis Include="toml++.natvis" />
+		<Natvis Include="..\toml++.natvis" />
 	</ItemGroup>
 	<ItemGroup>
-		<ClInclude Include="..\tests\catch2.h" />
-		<ClInclude Include="..\tests\evil_macros.h" />
-		<ClInclude Include="..\tests\settings.h" />
-		<ClInclude Include="..\tests\tests.h" />
-		<ClInclude Include="..\tests\tloptional.h" />
-		<ClInclude Include="..\tests\unicode.h" />
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
 	</ItemGroup>
 	<ItemGroup>
-		<None Include="..\tests\meson.build" />
+		<None Include="..\..\tests\meson.build" />
 	</ItemGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

vs/tests/test_release_x86_noexcept.vcxproj

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="Debug|Win32">
-			<Configuration>Debug</Configuration>
-			<Platform>Win32</Platform>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Release|Win32">
 			<Configuration>Release</Configuration>
 			<Platform>Win32</Platform>
@@ -12,7 +8,7 @@
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<VCProjectVersion>16.0</VCProjectVersion>
-		<ProjectGuid>{F48A5075-A26E-58D1-930B-8DBE88598338}</ProjectGuid>
+		<ProjectGuid>{0D4D9D25-3F93-5C37-866E-F8B0AC23F851}</ProjectGuid>
 		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -34,7 +30,7 @@
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
 			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<Import Project="toml++.props" />
+	<Import Project="../toml++.props" />
 	<ItemDefinitionGroup>
 		<ClCompile>
 			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -43,57 +39,59 @@
 			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
 			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<LanguageStandard>stdcpp17</LanguageStandard>
 		</ClCompile>
 	</ItemDefinitionGroup>
 	<PropertyGroup>
-		<LocalDebuggerWorkingDirectory>..\tests\</LocalDebuggerWorkingDirectory>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
 	</PropertyGroup>
 	<ItemGroup>
-		<ClCompile Include="..\tests\conformance_burntsushi_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_burntsushi_valid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_valid.cpp" />
-		<ClCompile Include="..\tests\impl_catch2.cpp">
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\impl_toml.cpp">
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\manipulating_arrays.cpp" />
-		<ClCompile Include="..\tests\manipulating_tables.cpp" />
-		<ClCompile Include="..\tests\manipulating_parse_result.cpp" />
-		<ClCompile Include="..\tests\manipulating_values.cpp" />
-		<ClCompile Include="..\tests\parsing_arrays.cpp" />
-		<ClCompile Include="..\tests\parsing_booleans.cpp" />
-		<ClCompile Include="..\tests\parsing_comments.cpp" />
-		<ClCompile Include="..\tests\parsing_dates_and_times.cpp" />
-		<ClCompile Include="..\tests\parsing_floats.cpp" />
-		<ClCompile Include="..\tests\parsing_integers.cpp" />
-		<ClCompile Include="..\tests\parsing_key_value_pairs.cpp" />
-		<ClCompile Include="..\tests\parsing_spec_example.cpp" />
-		<ClCompile Include="..\tests\parsing_strings.cpp" />
-		<ClCompile Include="..\tests\parsing_tables.cpp" />
-		<ClCompile Include="..\tests\tests.cpp">
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
 			<PrecompiledHeader>Create</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\unicode.cpp" />
-		<ClCompile Include="..\tests\unicode_generated.cpp" />
-		<ClCompile Include="..\tests\windows_compat.cpp" />
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
 	</ItemGroup>
 	<ItemGroup>
-		<Natvis Include="toml++.natvis" />
+		<Natvis Include="..\toml++.natvis" />
 	</ItemGroup>
 	<ItemGroup>
-		<ClInclude Include="..\tests\catch2.h" />
-		<ClInclude Include="..\tests\evil_macros.h" />
-		<ClInclude Include="..\tests\settings.h" />
-		<ClInclude Include="..\tests\tests.h" />
-		<ClInclude Include="..\tests\tloptional.h" />
-		<ClInclude Include="..\tests\unicode.h" />
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
 	</ItemGroup>
 	<ItemGroup>
-		<None Include="..\tests\meson.build" />
+		<None Include="..\..\tests\meson.build" />
 	</ItemGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

vs/tests/test_release_x86_noexcept_unrel.vcxproj

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="Debug|Win32">
-			<Configuration>Debug</Configuration>
-			<Platform>Win32</Platform>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Release|Win32">
 			<Configuration>Release</Configuration>
 			<Platform>Win32</Platform>
@@ -12,7 +8,7 @@
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<VCProjectVersion>16.0</VCProjectVersion>
-		<ProjectGuid>{DE1290DF-8EBF-5AD1-A07B-305C705892CE}</ProjectGuid>
+		<ProjectGuid>{151E9E68-E325-5B08-8722-257F2B083BAD}</ProjectGuid>
 		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -34,7 +30,7 @@
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
 			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<Import Project="toml++.props" />
+	<Import Project="../toml++.props" />
 	<ItemDefinitionGroup>
 		<ClCompile>
 			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -43,57 +39,59 @@
 			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
 			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<LanguageStandard>stdcpp17</LanguageStandard>
 		</ClCompile>
 	</ItemDefinitionGroup>
 	<PropertyGroup>
-		<LocalDebuggerWorkingDirectory>..\tests\</LocalDebuggerWorkingDirectory>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
 	</PropertyGroup>
 	<ItemGroup>
-		<ClCompile Include="..\tests\conformance_burntsushi_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_burntsushi_valid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_valid.cpp" />
-		<ClCompile Include="..\tests\impl_catch2.cpp">
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\impl_toml.cpp">
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\manipulating_arrays.cpp" />
-		<ClCompile Include="..\tests\manipulating_tables.cpp" />
-		<ClCompile Include="..\tests\manipulating_parse_result.cpp" />
-		<ClCompile Include="..\tests\manipulating_values.cpp" />
-		<ClCompile Include="..\tests\parsing_arrays.cpp" />
-		<ClCompile Include="..\tests\parsing_booleans.cpp" />
-		<ClCompile Include="..\tests\parsing_comments.cpp" />
-		<ClCompile Include="..\tests\parsing_dates_and_times.cpp" />
-		<ClCompile Include="..\tests\parsing_floats.cpp" />
-		<ClCompile Include="..\tests\parsing_integers.cpp" />
-		<ClCompile Include="..\tests\parsing_key_value_pairs.cpp" />
-		<ClCompile Include="..\tests\parsing_spec_example.cpp" />
-		<ClCompile Include="..\tests\parsing_strings.cpp" />
-		<ClCompile Include="..\tests\parsing_tables.cpp" />
-		<ClCompile Include="..\tests\tests.cpp">
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
 			<PrecompiledHeader>Create</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\unicode.cpp" />
-		<ClCompile Include="..\tests\unicode_generated.cpp" />
-		<ClCompile Include="..\tests\windows_compat.cpp" />
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
 	</ItemGroup>
 	<ItemGroup>
-		<Natvis Include="toml++.natvis" />
+		<Natvis Include="..\toml++.natvis" />
 	</ItemGroup>
 	<ItemGroup>
-		<ClInclude Include="..\tests\catch2.h" />
-		<ClInclude Include="..\tests\evil_macros.h" />
-		<ClInclude Include="..\tests\settings.h" />
-		<ClInclude Include="..\tests\tests.h" />
-		<ClInclude Include="..\tests\tloptional.h" />
-		<ClInclude Include="..\tests\unicode.h" />
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
 	</ItemGroup>
 	<ItemGroup>
-		<None Include="..\tests\meson.build" />
+		<None Include="..\..\tests\meson.build" />
 	</ItemGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

vs/tests/test_release_x86_unrel.vcxproj

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="Debug|Win32">
-			<Configuration>Debug</Configuration>
-			<Platform>Win32</Platform>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Release|Win32">
 			<Configuration>Release</Configuration>
 			<Platform>Win32</Platform>
@@ -12,7 +8,7 @@
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<VCProjectVersion>16.0</VCProjectVersion>
-		<ProjectGuid>{61286863-AD9B-5805-8478-EA339E5F4005}</ProjectGuid>
+		<ProjectGuid>{B3077FF1-FC90-5C14-A69F-3524F62167B1}</ProjectGuid>
 		<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -34,7 +30,7 @@
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
 			Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<Import Project="toml++.props" />
+	<Import Project="../toml++.props" />
 	<ItemDefinitionGroup>
 		<ClCompile>
 			<AdditionalIncludeDirectories>..\tests;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -43,57 +39,59 @@
 			<PrecompiledHeaderFile>tests.h</PrecompiledHeaderFile>
 			<PreprocessorDefinitions>TOML_UNRELEASED_FEATURES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'=='false'">SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions Condition="'%(ExceptionHandling)'!='false'">SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<LanguageStandard>stdcpp17</LanguageStandard>
 		</ClCompile>
 	</ItemDefinitionGroup>
 	<PropertyGroup>
-		<LocalDebuggerWorkingDirectory>..\tests\</LocalDebuggerWorkingDirectory>
+		<LocalDebuggerWorkingDirectory>..\..\tests\</LocalDebuggerWorkingDirectory>
 	</PropertyGroup>
 	<ItemGroup>
-		<ClCompile Include="..\tests\conformance_burntsushi_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_burntsushi_valid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_invalid.cpp" />
-		<ClCompile Include="..\tests\conformance_iarna_valid.cpp" />
-		<ClCompile Include="..\tests\impl_catch2.cpp">
+		<ClCompile Include="..\..\tests\conformance_burntsushi_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_burntsushi_valid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_invalid.cpp" />
+		<ClCompile Include="..\..\tests\conformance_iarna_valid.cpp" />
+		<ClCompile Include="..\..\tests\impl_catch2.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\impl_toml.cpp">
+		<ClCompile Include="..\..\tests\impl_toml.cpp">
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\manipulating_arrays.cpp" />
-		<ClCompile Include="..\tests\manipulating_tables.cpp" />
-		<ClCompile Include="..\tests\manipulating_parse_result.cpp" />
-		<ClCompile Include="..\tests\manipulating_values.cpp" />
-		<ClCompile Include="..\tests\parsing_arrays.cpp" />
-		<ClCompile Include="..\tests\parsing_booleans.cpp" />
-		<ClCompile Include="..\tests\parsing_comments.cpp" />
-		<ClCompile Include="..\tests\parsing_dates_and_times.cpp" />
-		<ClCompile Include="..\tests\parsing_floats.cpp" />
-		<ClCompile Include="..\tests\parsing_integers.cpp" />
-		<ClCompile Include="..\tests\parsing_key_value_pairs.cpp" />
-		<ClCompile Include="..\tests\parsing_spec_example.cpp" />
-		<ClCompile Include="..\tests\parsing_strings.cpp" />
-		<ClCompile Include="..\tests\parsing_tables.cpp" />
-		<ClCompile Include="..\tests\tests.cpp">
+		<ClCompile Include="..\..\tests\manipulating_arrays.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_tables.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_parse_result.cpp" />
+		<ClCompile Include="..\..\tests\manipulating_values.cpp" />
+		<ClCompile Include="..\..\tests\parsing_arrays.cpp" />
+		<ClCompile Include="..\..\tests\parsing_booleans.cpp" />
+		<ClCompile Include="..\..\tests\parsing_comments.cpp" />
+		<ClCompile Include="..\..\tests\parsing_dates_and_times.cpp" />
+		<ClCompile Include="..\..\tests\parsing_floats.cpp" />
+		<ClCompile Include="..\..\tests\parsing_integers.cpp" />
+		<ClCompile Include="..\..\tests\parsing_key_value_pairs.cpp" />
+		<ClCompile Include="..\..\tests\parsing_spec_example.cpp" />
+		<ClCompile Include="..\..\tests\parsing_strings.cpp" />
+		<ClCompile Include="..\..\tests\parsing_tables.cpp" />
+		<ClCompile Include="..\..\tests\tests.cpp">
 			<PrecompiledHeader>Create</PrecompiledHeader>
 		</ClCompile>
-		<ClCompile Include="..\tests\unicode.cpp" />
-		<ClCompile Include="..\tests\unicode_generated.cpp" />
-		<ClCompile Include="..\tests\windows_compat.cpp" />
+		<ClCompile Include="..\..\tests\unicode.cpp" />
+		<ClCompile Include="..\..\tests\unicode_generated.cpp" />
+		<ClCompile Include="..\..\tests\windows_compat.cpp" />
 	</ItemGroup>
 	<ItemGroup>
-		<Natvis Include="toml++.natvis" />
+		<Natvis Include="..\toml++.natvis" />
 	</ItemGroup>
 	<ItemGroup>
-		<ClInclude Include="..\tests\catch2.h" />
-		<ClInclude Include="..\tests\evil_macros.h" />
-		<ClInclude Include="..\tests\settings.h" />
-		<ClInclude Include="..\tests\tests.h" />
-		<ClInclude Include="..\tests\tloptional.h" />
-		<ClInclude Include="..\tests\unicode.h" />
+		<ClInclude Include="..\..\tests\catch2.h" />
+		<ClInclude Include="..\..\tests\evil_macros.h" />
+		<ClInclude Include="..\..\tests\settings.h" />
+		<ClInclude Include="..\..\tests\tests.h" />
+		<ClInclude Include="..\..\tests\tloptional.h" />
+		<ClInclude Include="..\..\tests\unicode.h" />
 	</ItemGroup>
 	<ItemGroup>
-		<None Include="..\tests\meson.build" />
+		<None Include="..\..\tests\meson.build" />
 	</ItemGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

vs/toml++.sln

@@ -6,9 +6,6 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toml++", "toml++.vcxproj", "{0E287B5A-1168-43FD-B067-F6BE8E182A57}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}"
-	ProjectSection(SolutionItems) = preProject
-		test_x64_cpplatest.vcxproj = test_x64_cpplatest.vcxproj
-	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{412816A5-9D22-4A30-BCDF-ABFB54BB3735}"
 EndProject
@@ -20,35 +17,69 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toml_generator", "toml_gene
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "error_printer", "error_printer.vcxproj", "{DAB4634D-8145-4860-AE45-5198E76FF324}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_x64", "test_x64.vcxproj", "{3227B3DB-D203-5485-98B4-0F3021AFB869}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_debug_x64", "tests\test_debug_x64.vcxproj", "{202DCF23-B4E4-5FB9-AFA8-CC9A718067FF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_x64_noexcept", "test_x64_noexcept.vcxproj", "{B51CFAB1-00F6-5EC0-B6E5-625D40631518}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_debug_x64_cpplatest", "tests\test_debug_x64_cpplatest.vcxproj", "{B0B1EA1E-611A-59B6-939F-0A891C71BBF0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_x64_unrel", "test_x64_unrel.vcxproj", "{902B7939-6FD3-5819-97A6-E23AE3675834}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_debug_x64_cpplatest_noexcept", "tests\test_debug_x64_cpplatest_noexcept.vcxproj", "{2D040A50-F533-5977-AF7F-B25C29112025}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_x64_unrel_noexcept", "test_x64_unrel_noexcept.vcxproj", "{3C57D63F-BD2A-5D8D-A2DF-8A94799343F7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_debug_x64_cpplatest_noexcept_unrel", "tests\test_debug_x64_cpplatest_noexcept_unrel.vcxproj", "{50988C9F-99C8-59C2-BCAA-AA1F0848472E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_x86", "test_x86.vcxproj", "{8E878D65-5FB5-5E31-B389-A83E040C49EA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_debug_x64_cpplatest_unrel", "tests\test_debug_x64_cpplatest_unrel.vcxproj", "{39175FCA-1342-507B-90F3-E8DCFB4C48D0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_x86_noexcept", "test_x86_noexcept.vcxproj", "{F48A5075-A26E-58D1-930B-8DBE88598338}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_debug_x64_noexcept", "tests\test_debug_x64_noexcept.vcxproj", "{70F7C29B-3468-5C09-8D47-B649CEBAB09E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_x86_unrel", "test_x86_unrel.vcxproj", "{61286863-AD9B-5805-8478-EA339E5F4005}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_debug_x64_noexcept_unrel", "tests\test_debug_x64_noexcept_unrel.vcxproj", "{62191BB3-97A9-552E-93BF-BFDF4D9905DD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_x86_unrel_noexcept", "test_x86_unrel_noexcept.vcxproj", "{DE1290DF-8EBF-5AD1-A07B-305C705892CE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_debug_x64_unrel", "tests\test_debug_x64_unrel.vcxproj", "{9A3431E3-4727-5FED-9C18-CCD300C2760E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_x64_cpplatest_noexcept", "test_x64_cpplatest_noexcept.vcxproj", "{DFA3136B-CE2F-5E5F-80FC-D395F3D72180}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_debug_x86", "tests\test_debug_x86.vcxproj", "{CFBAF3E0-2F81-5178-964C-F419CD2F296D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_x64_cpplatest_unrel", "test_x64_cpplatest_unrel.vcxproj", "{913FC307-267A-5D14-B00A-7721371AD4E2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_debug_x86_cpplatest", "tests\test_debug_x86_cpplatest.vcxproj", "{AD9A5FC3-6B12-5B6F-86C0-AB2FBB8C7766}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_x64_cpplatest_unrel_noexcept", "test_x64_cpplatest_unrel_noexcept.vcxproj", "{F301F5EB-C33D-5BF2-BAAF-531F28AB3A49}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_debug_x86_cpplatest_noexcept", "tests\test_debug_x86_cpplatest_noexcept.vcxproj", "{DC05B52F-D0ED-5F40-A5EC-92C4C1D77F98}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_x86_cpplatest", "test_x86_cpplatest.vcxproj", "{55D063AA-8120-5F31-9A9B-9EAAB910FBCE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_debug_x86_cpplatest_noexcept_unrel", "tests\test_debug_x86_cpplatest_noexcept_unrel.vcxproj", "{41DC0274-FFA8-5D94-AF8D-5677E3141095}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_x86_cpplatest_noexcept", "test_x86_cpplatest_noexcept.vcxproj", "{EB4C03FC-1CDE-5062-81DE-5948B382F85A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_debug_x86_cpplatest_unrel", "tests\test_debug_x86_cpplatest_unrel.vcxproj", "{C8B46DC3-994F-5A7C-98ED-3388BCE5D647}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_x86_cpplatest_unrel", "test_x86_cpplatest_unrel.vcxproj", "{955F593A-6BFC-57A3-9A34-5FE2F3F37ACA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_debug_x86_noexcept", "tests\test_debug_x86_noexcept.vcxproj", "{F7375F00-0345-5F67-89C0-2B18412B40FB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_x86_cpplatest_unrel_noexcept", "test_x86_cpplatest_unrel_noexcept.vcxproj", "{0C46DDD5-781E-51B8-8057-1C82FFE1D96F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_debug_x86_noexcept_unrel", "tests\test_debug_x86_noexcept_unrel.vcxproj", "{92AAC430-36B0-51E4-8E39-F3C579EDB331}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_debug_x86_unrel", "tests\test_debug_x86_unrel.vcxproj", "{B1EAF133-1019-510F-A083-FC04774FF12E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_release_x64", "tests\test_release_x64.vcxproj", "{F70977E7-E735-5D5C-9043-CA792F1B9392}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_release_x64_cpplatest", "tests\test_release_x64_cpplatest.vcxproj", "{413BDA52-0A9D-56B8-9AF3-A65019F42831}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_release_x64_cpplatest_noexcept", "tests\test_release_x64_cpplatest_noexcept.vcxproj", "{6F6D8031-4BA9-5F07-BE1F-190A2FC3CC9C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_release_x64_cpplatest_noexcept_unrel", "tests\test_release_x64_cpplatest_noexcept_unrel.vcxproj", "{18ADA45A-11DD-5649-8492-F726E6A82803}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_release_x64_cpplatest_unrel", "tests\test_release_x64_cpplatest_unrel.vcxproj", "{74813AFD-DB22-52FA-9108-0BADD4B0E161}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_release_x64_noexcept", "tests\test_release_x64_noexcept.vcxproj", "{B1B28D93-892C-59BF-9C6F-D813EC6438A0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_release_x64_noexcept_unrel", "tests\test_release_x64_noexcept_unrel.vcxproj", "{6C3EA8CD-33CC-5775-ACC4-631FF5FE1E2C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_release_x64_unrel", "tests\test_release_x64_unrel.vcxproj", "{B3779AEA-40D6-5F3C-BC86-98E4E577E09D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_release_x86", "tests\test_release_x86.vcxproj", "{2D7D2E84-8861-529C-9C05-A1EE1FB84084}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_release_x86_cpplatest", "tests\test_release_x86_cpplatest.vcxproj", "{B98D8D10-4B7B-5AA8-84B5-87FE6AA80C10}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_release_x86_cpplatest_noexcept", "tests\test_release_x86_cpplatest_noexcept.vcxproj", "{C9D50E23-65F2-5C1E-BE44-7327A9FFC637}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_release_x86_cpplatest_noexcept_unrel", "tests\test_release_x86_cpplatest_noexcept_unrel.vcxproj", "{082D6FBD-F01E-504B-9905-25937CCE7F9A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_release_x86_cpplatest_unrel", "tests\test_release_x86_cpplatest_unrel.vcxproj", "{AD2F4862-1DC2-550B-AFEF-FF3D4D477323}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_release_x86_noexcept", "tests\test_release_x86_noexcept.vcxproj", "{0D4D9D25-3F93-5C37-866E-F8B0AC23F851}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_release_x86_noexcept_unrel", "tests\test_release_x86_noexcept_unrel.vcxproj", "{151E9E68-E325-5B08-8722-257F2B083BAD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_release_x86_unrel", "tests\test_release_x86_unrel.vcxproj", "{B3077FF1-FC90-5C14-A69F-3524F62167B1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -57,9 +88,7 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{0E287B5A-1168-43FD-B067-F6BE8E182A57}.Debug|x64.ActiveCfg = Debug|x64
-		{0E287B5A-1168-43FD-B067-F6BE8E182A57}.Debug|x64.Build.0 = Debug|x64
 		{0E287B5A-1168-43FD-B067-F6BE8E182A57}.Release|x64.ActiveCfg = Release|x64
-		{0E287B5A-1168-43FD-B067-F6BE8E182A57}.Release|x64.Build.0 = Release|x64
 		{BE34AA99-BEE6-4B50-B237-217E7C88FCB5}.Debug|x64.ActiveCfg = Debug|x64
 		{BE34AA99-BEE6-4B50-B237-217E7C88FCB5}.Debug|x64.Build.0 = Debug|x64
 		{BE34AA99-BEE6-4B50-B237-217E7C88FCB5}.Release|x64.ActiveCfg = Release|x64
@@ -76,66 +105,134 @@ Global
 		{DAB4634D-8145-4860-AE45-5198E76FF324}.Debug|x64.Build.0 = Debug|x64
 		{DAB4634D-8145-4860-AE45-5198E76FF324}.Release|x64.ActiveCfg = Release|x64
 		{DAB4634D-8145-4860-AE45-5198E76FF324}.Release|x64.Build.0 = Release|x64
-		{3227B3DB-D203-5485-98B4-0F3021AFB869}.Debug|x64.ActiveCfg = Debug|x64
-		{3227B3DB-D203-5485-98B4-0F3021AFB869}.Debug|x64.Build.0 = Debug|x64
-		{3227B3DB-D203-5485-98B4-0F3021AFB869}.Release|x64.ActiveCfg = Release|x64
-		{3227B3DB-D203-5485-98B4-0F3021AFB869}.Release|x64.Build.0 = Release|x64
-		{B51CFAB1-00F6-5EC0-B6E5-625D40631518}.Debug|x64.ActiveCfg = Debug|x64
-		{B51CFAB1-00F6-5EC0-B6E5-625D40631518}.Debug|x64.Build.0 = Debug|x64
-		{B51CFAB1-00F6-5EC0-B6E5-625D40631518}.Release|x64.ActiveCfg = Release|x64
-		{B51CFAB1-00F6-5EC0-B6E5-625D40631518}.Release|x64.Build.0 = Release|x64
-		{902B7939-6FD3-5819-97A6-E23AE3675834}.Debug|x64.ActiveCfg = Debug|x64
-		{902B7939-6FD3-5819-97A6-E23AE3675834}.Debug|x64.Build.0 = Debug|x64
-		{902B7939-6FD3-5819-97A6-E23AE3675834}.Release|x64.ActiveCfg = Release|x64
-		{902B7939-6FD3-5819-97A6-E23AE3675834}.Release|x64.Build.0 = Release|x64
-		{3C57D63F-BD2A-5D8D-A2DF-8A94799343F7}.Debug|x64.ActiveCfg = Debug|x64
-		{3C57D63F-BD2A-5D8D-A2DF-8A94799343F7}.Debug|x64.Build.0 = Debug|x64
-		{3C57D63F-BD2A-5D8D-A2DF-8A94799343F7}.Release|x64.ActiveCfg = Release|x64
-		{3C57D63F-BD2A-5D8D-A2DF-8A94799343F7}.Release|x64.Build.0 = Release|x64
-		{8E878D65-5FB5-5E31-B389-A83E040C49EA}.Debug|x64.ActiveCfg = Debug|Win32
-		{8E878D65-5FB5-5E31-B389-A83E040C49EA}.Debug|x64.Build.0 = Debug|Win32
-		{8E878D65-5FB5-5E31-B389-A83E040C49EA}.Release|x64.ActiveCfg = Release|Win32
-		{8E878D65-5FB5-5E31-B389-A83E040C49EA}.Release|x64.Build.0 = Release|Win32
-		{F48A5075-A26E-58D1-930B-8DBE88598338}.Debug|x64.ActiveCfg = Debug|Win32
-		{F48A5075-A26E-58D1-930B-8DBE88598338}.Debug|x64.Build.0 = Debug|Win32
-		{F48A5075-A26E-58D1-930B-8DBE88598338}.Release|x64.ActiveCfg = Release|Win32
-		{F48A5075-A26E-58D1-930B-8DBE88598338}.Release|x64.Build.0 = Release|Win32
-		{61286863-AD9B-5805-8478-EA339E5F4005}.Debug|x64.ActiveCfg = Debug|Win32
-		{61286863-AD9B-5805-8478-EA339E5F4005}.Debug|x64.Build.0 = Debug|Win32
-		{61286863-AD9B-5805-8478-EA339E5F4005}.Release|x64.ActiveCfg = Release|Win32
-		{61286863-AD9B-5805-8478-EA339E5F4005}.Release|x64.Build.0 = Release|Win32
-		{DE1290DF-8EBF-5AD1-A07B-305C705892CE}.Debug|x64.ActiveCfg = Debug|Win32
-		{DE1290DF-8EBF-5AD1-A07B-305C705892CE}.Debug|x64.Build.0 = Debug|Win32
-		{DE1290DF-8EBF-5AD1-A07B-305C705892CE}.Release|x64.ActiveCfg = Release|Win32
-		{DE1290DF-8EBF-5AD1-A07B-305C705892CE}.Release|x64.Build.0 = Release|Win32
-		{DFA3136B-CE2F-5E5F-80FC-D395F3D72180}.Debug|x64.ActiveCfg = Debug|x64
-		{DFA3136B-CE2F-5E5F-80FC-D395F3D72180}.Debug|x64.Build.0 = Debug|x64
-		{DFA3136B-CE2F-5E5F-80FC-D395F3D72180}.Release|x64.ActiveCfg = Release|x64
-		{DFA3136B-CE2F-5E5F-80FC-D395F3D72180}.Release|x64.Build.0 = Release|x64
-		{913FC307-267A-5D14-B00A-7721371AD4E2}.Debug|x64.ActiveCfg = Debug|x64
-		{913FC307-267A-5D14-B00A-7721371AD4E2}.Debug|x64.Build.0 = Debug|x64
-		{913FC307-267A-5D14-B00A-7721371AD4E2}.Release|x64.ActiveCfg = Release|x64
-		{913FC307-267A-5D14-B00A-7721371AD4E2}.Release|x64.Build.0 = Release|x64
-		{F301F5EB-C33D-5BF2-BAAF-531F28AB3A49}.Debug|x64.ActiveCfg = Debug|x64
-		{F301F5EB-C33D-5BF2-BAAF-531F28AB3A49}.Debug|x64.Build.0 = Debug|x64
-		{F301F5EB-C33D-5BF2-BAAF-531F28AB3A49}.Release|x64.ActiveCfg = Release|x64
-		{F301F5EB-C33D-5BF2-BAAF-531F28AB3A49}.Release|x64.Build.0 = Release|x64
-		{55D063AA-8120-5F31-9A9B-9EAAB910FBCE}.Debug|x64.ActiveCfg = Debug|Win32
-		{55D063AA-8120-5F31-9A9B-9EAAB910FBCE}.Debug|x64.Build.0 = Debug|Win32
-		{55D063AA-8120-5F31-9A9B-9EAAB910FBCE}.Release|x64.ActiveCfg = Release|Win32
-		{55D063AA-8120-5F31-9A9B-9EAAB910FBCE}.Release|x64.Build.0 = Release|Win32
-		{EB4C03FC-1CDE-5062-81DE-5948B382F85A}.Debug|x64.ActiveCfg = Debug|Win32
-		{EB4C03FC-1CDE-5062-81DE-5948B382F85A}.Debug|x64.Build.0 = Debug|Win32
-		{EB4C03FC-1CDE-5062-81DE-5948B382F85A}.Release|x64.ActiveCfg = Release|Win32
-		{EB4C03FC-1CDE-5062-81DE-5948B382F85A}.Release|x64.Build.0 = Release|Win32
-		{955F593A-6BFC-57A3-9A34-5FE2F3F37ACA}.Debug|x64.ActiveCfg = Debug|Win32
-		{955F593A-6BFC-57A3-9A34-5FE2F3F37ACA}.Debug|x64.Build.0 = Debug|Win32
-		{955F593A-6BFC-57A3-9A34-5FE2F3F37ACA}.Release|x64.ActiveCfg = Release|Win32
-		{955F593A-6BFC-57A3-9A34-5FE2F3F37ACA}.Release|x64.Build.0 = Release|Win32
-		{0C46DDD5-781E-51B8-8057-1C82FFE1D96F}.Debug|x64.ActiveCfg = Debug|Win32
-		{0C46DDD5-781E-51B8-8057-1C82FFE1D96F}.Debug|x64.Build.0 = Debug|Win32
-		{0C46DDD5-781E-51B8-8057-1C82FFE1D96F}.Release|x64.ActiveCfg = Release|Win32
-		{0C46DDD5-781E-51B8-8057-1C82FFE1D96F}.Release|x64.Build.0 = Release|Win32
+		{202DCF23-B4E4-5FB9-AFA8-CC9A718067FF}.Debug|x64.ActiveCfg = Debug|x64
+		{202DCF23-B4E4-5FB9-AFA8-CC9A718067FF}.Debug|x64.Build.0 = Debug|x64
+		{202DCF23-B4E4-5FB9-AFA8-CC9A718067FF}.Release|x64.ActiveCfg = Debug|x64
+		{202DCF23-B4E4-5FB9-AFA8-CC9A718067FF}.Release|x64.Build.0 = Debug|x64
+		{B0B1EA1E-611A-59B6-939F-0A891C71BBF0}.Debug|x64.ActiveCfg = Debug|x64
+		{B0B1EA1E-611A-59B6-939F-0A891C71BBF0}.Debug|x64.Build.0 = Debug|x64
+		{B0B1EA1E-611A-59B6-939F-0A891C71BBF0}.Release|x64.ActiveCfg = Debug|x64
+		{B0B1EA1E-611A-59B6-939F-0A891C71BBF0}.Release|x64.Build.0 = Debug|x64
+		{2D040A50-F533-5977-AF7F-B25C29112025}.Debug|x64.ActiveCfg = Debug|x64
+		{2D040A50-F533-5977-AF7F-B25C29112025}.Debug|x64.Build.0 = Debug|x64
+		{2D040A50-F533-5977-AF7F-B25C29112025}.Release|x64.ActiveCfg = Debug|x64
+		{2D040A50-F533-5977-AF7F-B25C29112025}.Release|x64.Build.0 = Debug|x64
+		{50988C9F-99C8-59C2-BCAA-AA1F0848472E}.Debug|x64.ActiveCfg = Debug|x64
+		{50988C9F-99C8-59C2-BCAA-AA1F0848472E}.Debug|x64.Build.0 = Debug|x64
+		{50988C9F-99C8-59C2-BCAA-AA1F0848472E}.Release|x64.ActiveCfg = Debug|x64
+		{50988C9F-99C8-59C2-BCAA-AA1F0848472E}.Release|x64.Build.0 = Debug|x64
+		{39175FCA-1342-507B-90F3-E8DCFB4C48D0}.Debug|x64.ActiveCfg = Debug|x64
+		{39175FCA-1342-507B-90F3-E8DCFB4C48D0}.Debug|x64.Build.0 = Debug|x64
+		{39175FCA-1342-507B-90F3-E8DCFB4C48D0}.Release|x64.ActiveCfg = Debug|x64
+		{39175FCA-1342-507B-90F3-E8DCFB4C48D0}.Release|x64.Build.0 = Debug|x64
+		{70F7C29B-3468-5C09-8D47-B649CEBAB09E}.Debug|x64.ActiveCfg = Debug|x64
+		{70F7C29B-3468-5C09-8D47-B649CEBAB09E}.Debug|x64.Build.0 = Debug|x64
+		{70F7C29B-3468-5C09-8D47-B649CEBAB09E}.Release|x64.ActiveCfg = Debug|x64
+		{70F7C29B-3468-5C09-8D47-B649CEBAB09E}.Release|x64.Build.0 = Debug|x64
+		{62191BB3-97A9-552E-93BF-BFDF4D9905DD}.Debug|x64.ActiveCfg = Debug|x64
+		{62191BB3-97A9-552E-93BF-BFDF4D9905DD}.Debug|x64.Build.0 = Debug|x64
+		{62191BB3-97A9-552E-93BF-BFDF4D9905DD}.Release|x64.ActiveCfg = Debug|x64
+		{62191BB3-97A9-552E-93BF-BFDF4D9905DD}.Release|x64.Build.0 = Debug|x64
+		{9A3431E3-4727-5FED-9C18-CCD300C2760E}.Debug|x64.ActiveCfg = Debug|x64
+		{9A3431E3-4727-5FED-9C18-CCD300C2760E}.Debug|x64.Build.0 = Debug|x64
+		{9A3431E3-4727-5FED-9C18-CCD300C2760E}.Release|x64.ActiveCfg = Debug|x64
+		{9A3431E3-4727-5FED-9C18-CCD300C2760E}.Release|x64.Build.0 = Debug|x64
+		{CFBAF3E0-2F81-5178-964C-F419CD2F296D}.Debug|x64.ActiveCfg = Debug|Win32
+		{CFBAF3E0-2F81-5178-964C-F419CD2F296D}.Debug|x64.Build.0 = Debug|Win32
+		{CFBAF3E0-2F81-5178-964C-F419CD2F296D}.Release|x64.ActiveCfg = Debug|Win32
+		{CFBAF3E0-2F81-5178-964C-F419CD2F296D}.Release|x64.Build.0 = Debug|Win32
+		{AD9A5FC3-6B12-5B6F-86C0-AB2FBB8C7766}.Debug|x64.ActiveCfg = Debug|Win32
+		{AD9A5FC3-6B12-5B6F-86C0-AB2FBB8C7766}.Debug|x64.Build.0 = Debug|Win32
+		{AD9A5FC3-6B12-5B6F-86C0-AB2FBB8C7766}.Release|x64.ActiveCfg = Debug|Win32
+		{AD9A5FC3-6B12-5B6F-86C0-AB2FBB8C7766}.Release|x64.Build.0 = Debug|Win32
+		{DC05B52F-D0ED-5F40-A5EC-92C4C1D77F98}.Debug|x64.ActiveCfg = Debug|Win32
+		{DC05B52F-D0ED-5F40-A5EC-92C4C1D77F98}.Debug|x64.Build.0 = Debug|Win32
+		{DC05B52F-D0ED-5F40-A5EC-92C4C1D77F98}.Release|x64.ActiveCfg = Debug|Win32
+		{DC05B52F-D0ED-5F40-A5EC-92C4C1D77F98}.Release|x64.Build.0 = Debug|Win32
+		{41DC0274-FFA8-5D94-AF8D-5677E3141095}.Debug|x64.ActiveCfg = Debug|Win32
+		{41DC0274-FFA8-5D94-AF8D-5677E3141095}.Debug|x64.Build.0 = Debug|Win32
+		{41DC0274-FFA8-5D94-AF8D-5677E3141095}.Release|x64.ActiveCfg = Debug|Win32
+		{41DC0274-FFA8-5D94-AF8D-5677E3141095}.Release|x64.Build.0 = Debug|Win32
+		{C8B46DC3-994F-5A7C-98ED-3388BCE5D647}.Debug|x64.ActiveCfg = Debug|Win32
+		{C8B46DC3-994F-5A7C-98ED-3388BCE5D647}.Debug|x64.Build.0 = Debug|Win32
+		{C8B46DC3-994F-5A7C-98ED-3388BCE5D647}.Release|x64.ActiveCfg = Debug|Win32
+		{C8B46DC3-994F-5A7C-98ED-3388BCE5D647}.Release|x64.Build.0 = Debug|Win32
+		{F7375F00-0345-5F67-89C0-2B18412B40FB}.Debug|x64.ActiveCfg = Debug|Win32
+		{F7375F00-0345-5F67-89C0-2B18412B40FB}.Debug|x64.Build.0 = Debug|Win32
+		{F7375F00-0345-5F67-89C0-2B18412B40FB}.Release|x64.ActiveCfg = Debug|Win32
+		{F7375F00-0345-5F67-89C0-2B18412B40FB}.Release|x64.Build.0 = Debug|Win32
+		{92AAC430-36B0-51E4-8E39-F3C579EDB331}.Debug|x64.ActiveCfg = Debug|Win32
+		{92AAC430-36B0-51E4-8E39-F3C579EDB331}.Debug|x64.Build.0 = Debug|Win32
+		{92AAC430-36B0-51E4-8E39-F3C579EDB331}.Release|x64.ActiveCfg = Debug|Win32
+		{92AAC430-36B0-51E4-8E39-F3C579EDB331}.Release|x64.Build.0 = Debug|Win32
+		{B1EAF133-1019-510F-A083-FC04774FF12E}.Debug|x64.ActiveCfg = Debug|Win32
+		{B1EAF133-1019-510F-A083-FC04774FF12E}.Debug|x64.Build.0 = Debug|Win32
+		{B1EAF133-1019-510F-A083-FC04774FF12E}.Release|x64.ActiveCfg = Debug|Win32
+		{B1EAF133-1019-510F-A083-FC04774FF12E}.Release|x64.Build.0 = Debug|Win32
+		{F70977E7-E735-5D5C-9043-CA792F1B9392}.Debug|x64.ActiveCfg = Release|x64
+		{F70977E7-E735-5D5C-9043-CA792F1B9392}.Debug|x64.Build.0 = Release|x64
+		{F70977E7-E735-5D5C-9043-CA792F1B9392}.Release|x64.ActiveCfg = Release|x64
+		{F70977E7-E735-5D5C-9043-CA792F1B9392}.Release|x64.Build.0 = Release|x64
+		{413BDA52-0A9D-56B8-9AF3-A65019F42831}.Debug|x64.ActiveCfg = Release|x64
+		{413BDA52-0A9D-56B8-9AF3-A65019F42831}.Debug|x64.Build.0 = Release|x64
+		{413BDA52-0A9D-56B8-9AF3-A65019F42831}.Release|x64.ActiveCfg = Release|x64
+		{413BDA52-0A9D-56B8-9AF3-A65019F42831}.Release|x64.Build.0 = Release|x64
+		{6F6D8031-4BA9-5F07-BE1F-190A2FC3CC9C}.Debug|x64.ActiveCfg = Release|x64
+		{6F6D8031-4BA9-5F07-BE1F-190A2FC3CC9C}.Debug|x64.Build.0 = Release|x64
+		{6F6D8031-4BA9-5F07-BE1F-190A2FC3CC9C}.Release|x64.ActiveCfg = Release|x64
+		{6F6D8031-4BA9-5F07-BE1F-190A2FC3CC9C}.Release|x64.Build.0 = Release|x64
+		{18ADA45A-11DD-5649-8492-F726E6A82803}.Debug|x64.ActiveCfg = Release|x64
+		{18ADA45A-11DD-5649-8492-F726E6A82803}.Debug|x64.Build.0 = Release|x64
+		{18ADA45A-11DD-5649-8492-F726E6A82803}.Release|x64.ActiveCfg = Release|x64
+		{18ADA45A-11DD-5649-8492-F726E6A82803}.Release|x64.Build.0 = Release|x64
+		{74813AFD-DB22-52FA-9108-0BADD4B0E161}.Debug|x64.ActiveCfg = Release|x64
+		{74813AFD-DB22-52FA-9108-0BADD4B0E161}.Debug|x64.Build.0 = Release|x64
+		{74813AFD-DB22-52FA-9108-0BADD4B0E161}.Release|x64.ActiveCfg = Release|x64
+		{74813AFD-DB22-52FA-9108-0BADD4B0E161}.Release|x64.Build.0 = Release|x64
+		{B1B28D93-892C-59BF-9C6F-D813EC6438A0}.Debug|x64.ActiveCfg = Release|x64
+		{B1B28D93-892C-59BF-9C6F-D813EC6438A0}.Debug|x64.Build.0 = Release|x64
+		{B1B28D93-892C-59BF-9C6F-D813EC6438A0}.Release|x64.ActiveCfg = Release|x64
+		{B1B28D93-892C-59BF-9C6F-D813EC6438A0}.Release|x64.Build.0 = Release|x64
+		{6C3EA8CD-33CC-5775-ACC4-631FF5FE1E2C}.Debug|x64.ActiveCfg = Release|x64
+		{6C3EA8CD-33CC-5775-ACC4-631FF5FE1E2C}.Debug|x64.Build.0 = Release|x64
+		{6C3EA8CD-33CC-5775-ACC4-631FF5FE1E2C}.Release|x64.ActiveCfg = Release|x64
+		{6C3EA8CD-33CC-5775-ACC4-631FF5FE1E2C}.Release|x64.Build.0 = Release|x64
+		{B3779AEA-40D6-5F3C-BC86-98E4E577E09D}.Debug|x64.ActiveCfg = Release|x64
+		{B3779AEA-40D6-5F3C-BC86-98E4E577E09D}.Debug|x64.Build.0 = Release|x64
+		{B3779AEA-40D6-5F3C-BC86-98E4E577E09D}.Release|x64.ActiveCfg = Release|x64
+		{B3779AEA-40D6-5F3C-BC86-98E4E577E09D}.Release|x64.Build.0 = Release|x64
+		{2D7D2E84-8861-529C-9C05-A1EE1FB84084}.Debug|x64.ActiveCfg = Release|Win32
+		{2D7D2E84-8861-529C-9C05-A1EE1FB84084}.Debug|x64.Build.0 = Release|Win32
+		{2D7D2E84-8861-529C-9C05-A1EE1FB84084}.Release|x64.ActiveCfg = Release|Win32
+		{2D7D2E84-8861-529C-9C05-A1EE1FB84084}.Release|x64.Build.0 = Release|Win32
+		{B98D8D10-4B7B-5AA8-84B5-87FE6AA80C10}.Debug|x64.ActiveCfg = Release|Win32
+		{B98D8D10-4B7B-5AA8-84B5-87FE6AA80C10}.Debug|x64.Build.0 = Release|Win32
+		{B98D8D10-4B7B-5AA8-84B5-87FE6AA80C10}.Release|x64.ActiveCfg = Release|Win32
+		{B98D8D10-4B7B-5AA8-84B5-87FE6AA80C10}.Release|x64.Build.0 = Release|Win32
+		{C9D50E23-65F2-5C1E-BE44-7327A9FFC637}.Debug|x64.ActiveCfg = Release|Win32
+		{C9D50E23-65F2-5C1E-BE44-7327A9FFC637}.Debug|x64.Build.0 = Release|Win32
+		{C9D50E23-65F2-5C1E-BE44-7327A9FFC637}.Release|x64.ActiveCfg = Release|Win32
+		{C9D50E23-65F2-5C1E-BE44-7327A9FFC637}.Release|x64.Build.0 = Release|Win32
+		{082D6FBD-F01E-504B-9905-25937CCE7F9A}.Debug|x64.ActiveCfg = Release|Win32
+		{082D6FBD-F01E-504B-9905-25937CCE7F9A}.Debug|x64.Build.0 = Release|Win32
+		{082D6FBD-F01E-504B-9905-25937CCE7F9A}.Release|x64.ActiveCfg = Release|Win32
+		{082D6FBD-F01E-504B-9905-25937CCE7F9A}.Release|x64.Build.0 = Release|Win32
+		{AD2F4862-1DC2-550B-AFEF-FF3D4D477323}.Debug|x64.ActiveCfg = Release|Win32
+		{AD2F4862-1DC2-550B-AFEF-FF3D4D477323}.Debug|x64.Build.0 = Release|Win32
+		{AD2F4862-1DC2-550B-AFEF-FF3D4D477323}.Release|x64.ActiveCfg = Release|Win32
+		{AD2F4862-1DC2-550B-AFEF-FF3D4D477323}.Release|x64.Build.0 = Release|Win32
+		{0D4D9D25-3F93-5C37-866E-F8B0AC23F851}.Debug|x64.ActiveCfg = Release|Win32
+		{0D4D9D25-3F93-5C37-866E-F8B0AC23F851}.Debug|x64.Build.0 = Release|Win32
+		{0D4D9D25-3F93-5C37-866E-F8B0AC23F851}.Release|x64.ActiveCfg = Release|Win32
+		{0D4D9D25-3F93-5C37-866E-F8B0AC23F851}.Release|x64.Build.0 = Release|Win32
+		{151E9E68-E325-5B08-8722-257F2B083BAD}.Debug|x64.ActiveCfg = Release|Win32
+		{151E9E68-E325-5B08-8722-257F2B083BAD}.Debug|x64.Build.0 = Release|Win32
+		{151E9E68-E325-5B08-8722-257F2B083BAD}.Release|x64.ActiveCfg = Release|Win32
+		{151E9E68-E325-5B08-8722-257F2B083BAD}.Release|x64.Build.0 = Release|Win32
+		{B3077FF1-FC90-5C14-A69F-3524F62167B1}.Debug|x64.ActiveCfg = Release|Win32
+		{B3077FF1-FC90-5C14-A69F-3524F62167B1}.Debug|x64.Build.0 = Release|Win32
+		{B3077FF1-FC90-5C14-A69F-3524F62167B1}.Release|x64.ActiveCfg = Release|Win32
+		{B3077FF1-FC90-5C14-A69F-3524F62167B1}.Release|x64.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -145,21 +242,38 @@ Global
 		{259FCEE5-3442-4076-9547-2BA793ECA1CB} = {412816A5-9D22-4A30-BCDF-ABFB54BB3735}
 		{23CE3B73-FEE7-436C-9B4E-3DFB202EE9A2} = {412816A5-9D22-4A30-BCDF-ABFB54BB3735}
 		{DAB4634D-8145-4860-AE45-5198E76FF324} = {412816A5-9D22-4A30-BCDF-ABFB54BB3735}
-		{3227B3DB-D203-5485-98B4-0F3021AFB869} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
-		{B51CFAB1-00F6-5EC0-B6E5-625D40631518} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
-		{902B7939-6FD3-5819-97A6-E23AE3675834} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
-		{3C57D63F-BD2A-5D8D-A2DF-8A94799343F7} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
-		{8E878D65-5FB5-5E31-B389-A83E040C49EA} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
-		{F48A5075-A26E-58D1-930B-8DBE88598338} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
-		{61286863-AD9B-5805-8478-EA339E5F4005} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
-		{DE1290DF-8EBF-5AD1-A07B-305C705892CE} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
-		{DFA3136B-CE2F-5E5F-80FC-D395F3D72180} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
-		{913FC307-267A-5D14-B00A-7721371AD4E2} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
-		{F301F5EB-C33D-5BF2-BAAF-531F28AB3A49} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
-		{55D063AA-8120-5F31-9A9B-9EAAB910FBCE} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
-		{EB4C03FC-1CDE-5062-81DE-5948B382F85A} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
-		{955F593A-6BFC-57A3-9A34-5FE2F3F37ACA} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
-		{0C46DDD5-781E-51B8-8057-1C82FFE1D96F} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{202DCF23-B4E4-5FB9-AFA8-CC9A718067FF} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{B0B1EA1E-611A-59B6-939F-0A891C71BBF0} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{2D040A50-F533-5977-AF7F-B25C29112025} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{50988C9F-99C8-59C2-BCAA-AA1F0848472E} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{39175FCA-1342-507B-90F3-E8DCFB4C48D0} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{70F7C29B-3468-5C09-8D47-B649CEBAB09E} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{62191BB3-97A9-552E-93BF-BFDF4D9905DD} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{9A3431E3-4727-5FED-9C18-CCD300C2760E} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{CFBAF3E0-2F81-5178-964C-F419CD2F296D} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{AD9A5FC3-6B12-5B6F-86C0-AB2FBB8C7766} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{DC05B52F-D0ED-5F40-A5EC-92C4C1D77F98} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{41DC0274-FFA8-5D94-AF8D-5677E3141095} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{C8B46DC3-994F-5A7C-98ED-3388BCE5D647} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{F7375F00-0345-5F67-89C0-2B18412B40FB} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{92AAC430-36B0-51E4-8E39-F3C579EDB331} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{B1EAF133-1019-510F-A083-FC04774FF12E} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{F70977E7-E735-5D5C-9043-CA792F1B9392} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{413BDA52-0A9D-56B8-9AF3-A65019F42831} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{6F6D8031-4BA9-5F07-BE1F-190A2FC3CC9C} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{18ADA45A-11DD-5649-8492-F726E6A82803} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{74813AFD-DB22-52FA-9108-0BADD4B0E161} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{B1B28D93-892C-59BF-9C6F-D813EC6438A0} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{6C3EA8CD-33CC-5775-ACC4-631FF5FE1E2C} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{B3779AEA-40D6-5F3C-BC86-98E4E577E09D} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{2D7D2E84-8861-529C-9C05-A1EE1FB84084} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{B98D8D10-4B7B-5AA8-84B5-87FE6AA80C10} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{C9D50E23-65F2-5C1E-BE44-7327A9FFC637} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{082D6FBD-F01E-504B-9905-25937CCE7F9A} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{AD2F4862-1DC2-550B-AFEF-FF3D4D477323} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{0D4D9D25-3F93-5C37-866E-F8B0AC23F851} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{151E9E68-E325-5B08-8722-257F2B083BAD} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
+		{B3077FF1-FC90-5C14-A69F-3524F62167B1} = {4E25CF88-D7D8-4A9C-A52E-0D78281E82EC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0926DDCC-88CD-4839-A82D-D9B99E02A0B1}