From e8978c01abe375ec2f704411fdab02401ea63ae5 Mon Sep 17 00:00:00 2001
From: "Jordan Maples [MSFT]" <49793787+JordanMaples@users.noreply.github.com>
Date: Thu, 29 Oct 2020 11:34:05 -0700
Subject: [PATCH] Remove deprecation of basic_zstring et al (#945)

* Azure pipeline (#8)

* azure-pipeline test

* nl @ eof

* trimming the pipeline and adding debug steps

* removing redundant lines

* change ctest to script cmd and remove debug

* removed bad char

* added dir change for ctest

* explicit output file and cmake standard

* test cat

* more ctest tests

* injecting failure in test for validation

* another test

* removing bad test

* massive matrix

* added parallel

* commenting everything but xcode out for testing purposes

* uncomment the other tests

* testing some variables

* rename

* changed macos versions

* adding one more layer of templates

* fixing jobs.yml

* idk what i'm doing

* slight modifications

* maybe some spaces will help

* removing 'variables.'

* another test

* adding back pr w/ autocancel

* adding failing test to validate error = failing task

* remove failing test

* trigger master

* nl in steps.yml

* removing deprecation of basic_zstring and derived types. only *string_span should have been deprecated
---
 include/gsl/string_span | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/include/gsl/string_span b/include/gsl/string_span
index 78a9cb0..2c11228 100644
--- a/include/gsl/string_span
+++ b/include/gsl/string_span
@@ -57,48 +57,31 @@ namespace gsl
 //
 
 template <typename CharT, std::size_t Extent = dynamic_extent>
-using basic_zstring [[deprecated("string_span was removed from the C++ Core Guidelines. For more "
-                                 "information, see isocpp/CppCoreGuidelines PR#1680")]] = CharT*;
+using basic_zstring = CharT*;
 
 template <std::size_t Extent = dynamic_extent>
-using czstring [[deprecated("string_span was removed from the C++ Core Guidelines. For more "
-                            "information, see isocpp/CppCoreGuidelines PR#1680")]] =
-    basic_zstring<const char, Extent>;
+using czstring = basic_zstring<const char, Extent>;
 
 template <std::size_t Extent = dynamic_extent>
-using cwzstring [[deprecated("string_span was removed from the C++ Core Guidelines. For more "
-                             "information, see isocpp/CppCoreGuidelines PR#1680")]] =
-    basic_zstring<const wchar_t, Extent>;
+using cwzstring = basic_zstring<const wchar_t, Extent>;
 
 template <std::size_t Extent = dynamic_extent>
-using cu16zstring [[deprecated("string_span was removed from the C++ Core Guidelines. For more "
-                               "information, see isocpp/CppCoreGuidelines PR#1680")]] =
-    basic_zstring<const char16_t, Extent>;
+using cu16zstring = basic_zstring<const char16_t, Extent>;
 
 template <std::size_t Extent = dynamic_extent>
-using cu32zstring [[deprecated("string_span was removed from the C++ Core Guidelines. For more "
-                               "information, see isocpp/CppCoreGuidelines PR#1680")]] =
-    basic_zstring<const char32_t, Extent>;
+using cu32zstring = basic_zstring<const char32_t, Extent>;
 
 template <std::size_t Extent = dynamic_extent>
-using zstring [[deprecated("string_span was removed from the C++ Core Guidelines. For more "
-                           "information, see isocpp/CppCoreGuidelines PR#1680")]] =
-    basic_zstring<char, Extent>;
+using zstring = basic_zstring<char, Extent>;
 
 template <std::size_t Extent = dynamic_extent>
-using wzstring [[deprecated("string_span was removed from the C++ Core Guidelines. For more "
-                            "information, see isocpp/CppCoreGuidelines PR#1680")]] =
-    basic_zstring<wchar_t, Extent>;
+using wzstring = basic_zstring<wchar_t, Extent>;
 
 template <std::size_t Extent = dynamic_extent>
-using u16zstring [[deprecated("string_span was removed from the C++ Core Guidelines. For more "
-                              "information, see isocpp/CppCoreGuidelines PR#1680")]] =
-    basic_zstring<char16_t, Extent>;
+using u16zstring = basic_zstring<char16_t, Extent>;
 
 template <std::size_t Extent = dynamic_extent>
-using u32zstring [[deprecated("string_span was removed from the C++ Core Guidelines. For more "
-                              "information, see isocpp/CppCoreGuidelines PR#1680")]] =
-    basic_zstring<char32_t, Extent>;
+using u32zstring = basic_zstring<char32_t, Extent>;
 
 namespace details
 {