fixed _Float16 erroneously supported on g++ (closes #57)

marzer · Sep 1, 2020 · 1f9b6c8 · 1f9b6c8
1 parent 977cfbb
commit 1f9b6c8
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 26 deletions.
diff --git a/include/toml++/toml_preprocessor.h b/include/toml++/toml_preprocessor.h
@@ -483,7 +483,7 @@ is no longer necessary.
 		#if (TOML_ARM && TOML_GCC) || TOML_CLANG
 			#define TOML_FP16 __fp16
 		#endif
-		#if TOML_ARM && (TOML_GCC || TOML_CLANG)
+		#if TOML_ARM && TOML_CLANG // not present in g++
 			#define TOML_FLOAT16 _Float16
 		#endif
 	#endif

diff --git a/tests/impl_toml.cpp b/tests/impl_toml.cpp
@@ -18,31 +18,6 @@
 	#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
-
 namespace toml
 {
 	using std::declval;

diff --git a/tests/tests.h b/tests/tests.h
@@ -17,6 +17,30 @@
 #else
 	#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
 
 #if TOML_ICC
 	#define UNICODE_LITERALS_OK 0