change from string to char*

tests/algorithm_tests.cpp

@@ -38,7 +38,7 @@
 #include <cstddef> // for size_t
 
 namespace{
-static const std::string deathstring("Expected Death");
+static const char *deathstring("Expected Death");
 }
 
 namespace gsl

tests/assertion_tests.cpp

@@ -51,7 +51,7 @@ int g(int i)
     return i;
 }
 
-static const std::string deathstring("Expected Death");
+static const char *deathstring("Expected Death");
 } // namespace
 
 TEST(assertion_tests, expects)

tests/at_tests.cpp

@@ -41,7 +41,7 @@
 #include <vector>           // for vector
 
 namespace{
-static const std::string deathstring("Expected Death");
+static const char *deathstring("Expected Death");
 }
 
 TEST(at_tests, static_array)
@@ -115,7 +115,7 @@ TEST(at_tests, InitializerList)
         EXPECT_TRUE(gsl::at(a, i) == i + 1);
         EXPECT_TRUE(gsl::at({1, 2, 3, 4}, i) == i + 1);
     }
-    
+
     std::set_terminate([] {
         std::cerr << "Expected Death. InitializerList";
         std::abort();

tests/multi_span_tests.cpp

@@ -139,7 +139,7 @@ void fn(const Bounds&)
     static_assert(Bounds::static_size == 60, "static bounds is wrong size");
 }
 
-static const std::string deathstring("Expected Death");
+static const char *deathstring("Expected Death");
 } // namespace
 
 TEST(multi_span_test, default_constructor)
@@ -426,7 +426,7 @@ TEST(multi_span_test, from_pointer_pointer_constructor)
         std::cerr << "Expected Death. from_pointer_pointer_constructor";
         std::abort();
     });
-    
+
     {
         auto workaround_macro = [&]() { const multi_span<int> s{&arr[1], &arr[0]}; };
         EXPECT_DEATH(workaround_macro(), deathstring);
@@ -1108,7 +1108,7 @@ TEST(multi_span_test, extent)
         std::cerr << "Expected Death. extent";
         std::abort();
     });
- 
+
     {
         multi_span<int> s;
         EXPECT_TRUE(s.extent() == 0);

tests/notnull_tests.cpp

@@ -53,7 +53,7 @@ struct fail_fast;
 using namespace gsl;
 
 namespace{
-static const std::string deathstring("Expected Death");
+static const char *deathstring("Expected Death");
 }
 
 struct MyBase
@@ -458,7 +458,7 @@ TEST(notnull_tests, TestNotNullConstructorTypeDeduction)
 
         EXPECT_TRUE(*x == 42);
     }
-    
+
     std::set_terminate([] {
         std::cerr << "Expected Death. TestNotNullConstructorTypeDeduction";
         std::abort();

tests/span_tests.cpp

@@ -75,7 +75,7 @@ struct AddressOverloaded
         return {};
     }
 };
-static const std::string deathstring("Expected Death");
+static const char *deathstring("Expected Death");
 } // namespace
 
 TEST(span_test, constructors)

tests/strict_notnull_tests.cpp

@@ -42,10 +42,6 @@ namespace gsl
 struct fail_fast;
 } // namespace gsl
 
-namespace{
-static const std::string deathstring("Expected Death");
-}
-
 using namespace gsl;
 
 GSL_SUPPRESS(f.4)  // NO-FORMAT: attribute
@@ -147,6 +143,7 @@ TEST(strict_notnull_tests, TestStrictNotNull)
 }
 
 #if defined(__cplusplus) && (__cplusplus >= 201703L)
+static const char *deathstring("Expected Death");
 
 TEST(strict_notnull_tests, TestStrictNotNullConstructorTypeDeduction)
 {

tests/strided_span_tests.cpp

@@ -56,7 +56,7 @@ using namespace gsl;
 
 namespace
 {
-static const std::string deathstring("Expected Death");
+static const char *deathstring("Expected Death");
 struct BaseClass
 {
 };
@@ -420,7 +420,7 @@ TEST(strided_span_tests, strided_span_bounds)
 {
     int arr[] = {0, 1, 2, 3};
     multi_span<int> av(arr);
-    
+
     std::set_terminate([] {
         std::cerr << "Expected Death. strided_span_bounds";
         std::abort();
@@ -541,7 +541,7 @@ TEST(strided_span_tests, strided_span_type_conversion)
 {
     int arr[] = {0, 1, 2, 3};
     multi_span<int> av(arr);
-        
+
     std::set_terminate([] {
         std::cerr << "Expected Death. strided_span_type_conversion";
         std::abort();

tests/string_span_tests.cpp

@@ -72,7 +72,7 @@ auto strnlen(const CharT* s, std::size_t n)
 
 namespace
 {
-static const std::string deathstring("Expected Death");
+static const char *deathstring("Expected Death");
 
 template <typename T>
 T move_wrapper(T&& t)
@@ -1046,7 +1046,7 @@ TEST(string_span_tests, wzstring)
 }
 
 TEST(string_span_tests, u16zstring)
-{    
+{
     std::set_terminate([] {
         std::cerr << "Expected Death. u16zstring";
         std::abort();

tests/utils_tests.cpp

@@ -45,7 +45,7 @@
 using namespace gsl;
 
 namespace{
-static const std::string deathstring("Expected Death");
+static const char *deathstring("Expected Death");
 void f(int& i) { i += 1; }
 static int j = 0;
 void g() { j += 1; }
@@ -119,7 +119,7 @@ TEST(utils_tests, narrow_cast)
 }
 
 TEST(utils_tests, narrow)
-{    
+{
     std::set_terminate([] {
         std::cerr << "Expected Death. narrow";
         std::abort();