libstdc++: Do not allow contract26.cc to build without -fcontracts

It seems prefereable to get a hard error if this file is built
incorrectly, rather than failing to define any symbols.

libstdc++-v3/ChangeLog:

	* src/experimental/contract26.cc: Use #error if built without
	contracts support enabled.
	* include/std/source_location: Remove stray whitespace.

diff --git a/libstdc++-v3/include/std/source_location b/libstdc++-v3/include/std/source_location
index 3a631c31c1e31f4b70f2b55188b0c32c52ac1862..170753fdde2a55dacd64b55a888152d868565907 100644 (file)
--- a/libstdc++-v3/include/std/source_location
+++ b/libstdc++-v3/include/std/source_location
@@ -94,7 +94,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
     constexpr source_location (const void *__t)
       : _M_impl (static_cast <const __impl*>(__t)) {}
-      
+
 #ifdef __cpp_lib_contracts
     /* To enable use of the source __impl*.  */
     friend class std::contracts::contract_violation;

diff --git a/libstdc++-v3/src/experimental/contract26.cc b/libstdc++-v3/src/experimental/contract26.cc
index d32a2ca13e2fbc323bb05527d8fde68df4e256f5..007a9fcbf5865995ab941e2161d660c05485bd78 100644 (file)
--- a/libstdc++-v3/src/experimental/contract26.cc
+++ b/libstdc++-v3/src/experimental/contract26.cc
@@ -25,7 +25,10 @@
 
 #include <contracts>
 
-#ifdef __cpp_lib_contracts
+#ifndef __cpp_lib_contracts
+# error "This file requires C++26 contracts support to be enabled"
+#endif
+
 #if _GLIBCXX_HOSTED && _GLIBCXX_VERBOSE
 # include <iostream>
 # include <cxxabi.h>
@@ -154,4 +157,3 @@ _Z41invoke_default_contract_violation_handlerRKNSt9contracts18contract_violation
 { invoke_default_contract_violation_handler(violation); }
 
 #endif
-#endif // __cpp_lib_contracts