[libc++][NFC] Suppress -Wdeprecated-literal-operator

poyaoc97 · poyaoc97 · commit bd03e0ca7572 · 2023-07-14T06:52:39.000+08:00
Remove spaces between operator"" and identifier to suppress -Wdeprecated-literal-operator, and between operator and "" like how they are written in [string.view.literals] and [basic.string.literals]. Differential Revision: https://reviews.llvm.org/D155200
diff --git a/libcxx/include/string b/libcxx/include/string
@@ -554,11 +554,11 @@ template <> struct hash<u16string>;
 template <> struct hash<u32string>;
 template <> struct hash<wstring>;
 
-basic_string<char>     operator "" s( const char *str,     size_t len );           // C++14, constexpr since C++20
-basic_string<wchar_t>  operator "" s( const wchar_t *str,  size_t len );           // C++14, constexpr since C++20
-constexpr basic_string<char8_t>  operator "" s( const char8_t *str,  size_t len ); // C++20
-basic_string<char16_t> operator "" s( const char16_t *str, size_t len );           // C++14, constexpr since C++20
-basic_string<char32_t> operator "" s( const char32_t *str, size_t len );           // C++14, constexpr since C++20
+basic_string<char>     operator""s( const char *str,     size_t len );           // C++14, constexpr since C++20
+basic_string<wchar_t>  operator""s( const wchar_t *str,  size_t len );           // C++14, constexpr since C++20
+constexpr basic_string<char8_t>  operator""s( const char8_t *str,  size_t len ); // C++20
+basic_string<char16_t> operator""s( const char16_t *str, size_t len );           // C++14, constexpr since C++20
+basic_string<char32_t> operator""s( const char32_t *str, size_t len );           // C++14, constexpr since C++20
 
 }  // std
 
@@ -4371,35 +4371,35 @@ inline namespace literals
   inline namespace string_literals
   {
     inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
-    basic_string<char> operator "" s( const char *__str, size_t __len )
+    basic_string<char> operator""s( const char *__str, size_t __len )
     {
         return basic_string<char> (__str, __len);
     }
 
 #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
     inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
-    basic_string<wchar_t> operator "" s( const wchar_t *__str, size_t __len )
+    basic_string<wchar_t> operator""s( const wchar_t *__str, size_t __len )
     {
         return basic_string<wchar_t> (__str, __len);
     }
 #endif
 
 #ifndef _LIBCPP_HAS_NO_CHAR8_T
     inline _LIBCPP_HIDE_FROM_ABI constexpr
-    basic_string<char8_t> operator "" s(const char8_t *__str, size_t __len)
+    basic_string<char8_t> operator""s(const char8_t *__str, size_t __len)
     {
         return basic_string<char8_t> (__str, __len);
     }
 #endif
 
     inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
-    basic_string<char16_t> operator "" s( const char16_t *__str, size_t __len )
+    basic_string<char16_t> operator""s( const char16_t *__str, size_t __len )
     {
         return basic_string<char16_t> (__str, __len);
     }
 
     inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
-    basic_string<char32_t> operator "" s( const char32_t *__str, size_t __len )
+    basic_string<char32_t> operator""s( const char32_t *__str, size_t __len )
     {
         return basic_string<char32_t> (__str, __len);
     }
diff --git a/libcxx/include/string_view b/libcxx/include/string_view
@@ -191,11 +191,11 @@ namespace std {
   template <> struct hash<u32string_view>;
   template <> struct hash<wstring_view>;
 
-  constexpr basic_string_view<char>     operator "" sv(const char *str,     size_t len) noexcept;
-  constexpr basic_string_view<wchar_t>  operator "" sv(const wchar_t *str,  size_t len) noexcept;
-  constexpr basic_string_view<char8_t>  operator "" sv(const char8_t *str,  size_t len) noexcept; // C++20
-  constexpr basic_string_view<char16_t> operator "" sv(const char16_t *str, size_t len) noexcept;
-  constexpr basic_string_view<char32_t> operator "" sv(const char32_t *str, size_t len) noexcept;
+  constexpr basic_string_view<char>     operator""sv(const char *str,     size_t len) noexcept;
+  constexpr basic_string_view<wchar_t>  operator""sv(const wchar_t *str,  size_t len) noexcept;
+  constexpr basic_string_view<char8_t>  operator""sv(const char8_t *str,  size_t len) noexcept; // C++20
+  constexpr basic_string_view<char16_t> operator""sv(const char16_t *str, size_t len) noexcept;
+  constexpr basic_string_view<char32_t> operator""sv(const char32_t *str, size_t len) noexcept;
 
 }  // namespace std
 
@@ -1015,35 +1015,35 @@ inline namespace literals
   inline namespace string_view_literals
   {
     inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    basic_string_view<char> operator "" sv(const char *__str, size_t __len) _NOEXCEPT
+    basic_string_view<char> operator""sv(const char *__str, size_t __len) _NOEXCEPT
     {
         return basic_string_view<char> (__str, __len);
     }
 
 #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
     inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    basic_string_view<wchar_t> operator "" sv(const wchar_t *__str, size_t __len) _NOEXCEPT
+    basic_string_view<wchar_t> operator""sv(const wchar_t *__str, size_t __len) _NOEXCEPT
     {
         return basic_string_view<wchar_t> (__str, __len);
     }
 #endif
 
 #ifndef _LIBCPP_HAS_NO_CHAR8_T
     inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    basic_string_view<char8_t> operator "" sv(const char8_t *__str, size_t __len) _NOEXCEPT
+    basic_string_view<char8_t> operator""sv(const char8_t *__str, size_t __len) _NOEXCEPT
     {
         return basic_string_view<char8_t> (__str, __len);
     }
 #endif
 
     inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    basic_string_view<char16_t> operator "" sv(const char16_t *__str, size_t __len) _NOEXCEPT
+    basic_string_view<char16_t> operator""sv(const char16_t *__str, size_t __len) _NOEXCEPT
     {
         return basic_string_view<char16_t> (__str, __len);
     }
 
     inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    basic_string_view<char32_t> operator "" sv(const char32_t *__str, size_t __len) _NOEXCEPT
+    basic_string_view<char32_t> operator""sv(const char32_t *__str, size_t __len) _NOEXCEPT
     {
         return basic_string_view<char32_t> (__str, __len);
     }
diff --git a/libcxx/modules/std/string_view.cppm b/libcxx/modules/std/string_view.cppm
@@ -42,7 +42,7 @@ export namespace std {
   inline namespace literals {
     inline namespace string_view_literals {
       // [string.view.literals], suffix for basic_string_view literals
-      using std::literals::string_view_literals::operator"" sv;
+      using std::literals::string_view_literals::operator""sv;
     } // namespace string_view_literals
   }   // namespace literals
 } // namespace std

Original file line number	Diff line number	Diff line change
`@@ -554,11 +554,11 @@ template <> struct hash<u16string>;`
`554`	`554`	`template <> struct hash<u32string>;`
`555`	`555`	`template <> struct hash<wstring>;`
`556`	`556`
`557`		`-basic_string<char> operator "" s( const char *str, size_t len ); // C++14, constexpr since C++20`
`558`		`-basic_string<wchar_t> operator "" s( const wchar_t *str, size_t len ); // C++14, constexpr since C++20`
`559`		`-constexpr basic_string<char8_t> operator "" s( const char8_t *str, size_t len ); // C++20`
`560`		`-basic_string<char16_t> operator "" s( const char16_t *str, size_t len ); // C++14, constexpr since C++20`
`561`		`-basic_string<char32_t> operator "" s( const char32_t *str, size_t len ); // C++14, constexpr since C++20`
	`557`	`+basic_string<char> operator""s( const char *str, size_t len ); // C++14, constexpr since C++20`
	`558`	`+basic_string<wchar_t> operator""s( const wchar_t *str, size_t len ); // C++14, constexpr since C++20`
	`559`	`+constexpr basic_string<char8_t> operator""s( const char8_t *str, size_t len ); // C++20`
	`560`	`+basic_string<char16_t> operator""s( const char16_t *str, size_t len ); // C++14, constexpr since C++20`
	`561`	`+basic_string<char32_t> operator""s( const char32_t *str, size_t len ); // C++14, constexpr since C++20`
`562`	`562`
`563`	`563`	`} // std`
`564`	`564`
`@@ -4371,35 +4371,35 @@ inline namespace literals`
`4371`	`4371`	`inline namespace string_literals`
`4372`	`4372`	`{`
`4373`	`4373`	`inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20`
`4374`		`- basic_string<char> operator "" s( const char *__str, size_t __len )`
	`4374`	`+ basic_string<char> operator""s( const char *__str, size_t __len )`
`4375`	`4375`	`{`
`4376`	`4376`	`return basic_string<char> (__str, __len);`
`4377`	`4377`	`}`
`4378`	`4378`
`4379`	`4379`	`#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS`
`4380`	`4380`	`inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20`
`4381`		`- basic_string<wchar_t> operator "" s( const wchar_t *__str, size_t __len )`
	`4381`	`+ basic_string<wchar_t> operator""s( const wchar_t *__str, size_t __len )`
`4382`	`4382`	`{`
`4383`	`4383`	`return basic_string<wchar_t> (__str, __len);`
`4384`	`4384`	`}`
`4385`	`4385`	`#endif`
`4386`	`4386`
`4387`	`4387`	`#ifndef _LIBCPP_HAS_NO_CHAR8_T`
`4388`	`4388`	`inline _LIBCPP_HIDE_FROM_ABI constexpr`
`4389`		`- basic_string<char8_t> operator "" s(const char8_t *__str, size_t __len)`
	`4389`	`+ basic_string<char8_t> operator""s(const char8_t *__str, size_t __len)`
`4390`	`4390`	`{`
`4391`	`4391`	`return basic_string<char8_t> (__str, __len);`
`4392`	`4392`	`}`
`4393`	`4393`	`#endif`
`4394`	`4394`
`4395`	`4395`	`inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20`
`4396`		`- basic_string<char16_t> operator "" s( const char16_t *__str, size_t __len )`
	`4396`	`+ basic_string<char16_t> operator""s( const char16_t *__str, size_t __len )`
`4397`	`4397`	`{`
`4398`	`4398`	`return basic_string<char16_t> (__str, __len);`
`4399`	`4399`	`}`
`4400`	`4400`
`4401`	`4401`	`inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20`
`4402`		`- basic_string<char32_t> operator "" s( const char32_t *__str, size_t __len )`
	`4402`	`+ basic_string<char32_t> operator""s( const char32_t *__str, size_t __len )`
`4403`	`4403`	`{`
`4404`	`4404`	`return basic_string<char32_t> (__str, __len);`
`4405`	`4405`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,11 +191,11 @@ namespace std {`
`191`	`191`	`template <> struct hash<u32string_view>;`
`192`	`192`	`template <> struct hash<wstring_view>;`
`193`	`193`
`194`		`- constexpr basic_string_view<char> operator "" sv(const char *str, size_t len) noexcept;`
`195`		`- constexpr basic_string_view<wchar_t> operator "" sv(const wchar_t *str, size_t len) noexcept;`
`196`		`- constexpr basic_string_view<char8_t> operator "" sv(const char8_t *str, size_t len) noexcept; // C++20`
`197`		`- constexpr basic_string_view<char16_t> operator "" sv(const char16_t *str, size_t len) noexcept;`
`198`		`- constexpr basic_string_view<char32_t> operator "" sv(const char32_t *str, size_t len) noexcept;`
	`194`	`+ constexpr basic_string_view<char> operator""sv(const char *str, size_t len) noexcept;`
	`195`	`+ constexpr basic_string_view<wchar_t> operator""sv(const wchar_t *str, size_t len) noexcept;`
	`196`	`+ constexpr basic_string_view<char8_t> operator""sv(const char8_t *str, size_t len) noexcept; // C++20`
	`197`	`+ constexpr basic_string_view<char16_t> operator""sv(const char16_t *str, size_t len) noexcept;`
	`198`	`+ constexpr basic_string_view<char32_t> operator""sv(const char32_t *str, size_t len) noexcept;`
`199`	`199`
`200`	`200`	`} // namespace std`
`201`	`201`
`@@ -1015,35 +1015,35 @@ inline namespace literals`
`1015`	`1015`	`inline namespace string_view_literals`
`1016`	`1016`	`{`
`1017`	`1017`	`inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR`
`1018`		`- basic_string_view<char> operator "" sv(const char *__str, size_t __len) _NOEXCEPT`
	`1018`	`+ basic_string_view<char> operator""sv(const char *__str, size_t __len) _NOEXCEPT`
`1019`	`1019`	`{`
`1020`	`1020`	`return basic_string_view<char> (__str, __len);`
`1021`	`1021`	`}`
`1022`	`1022`
`1023`	`1023`	`#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS`
`1024`	`1024`	`inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR`
`1025`		`- basic_string_view<wchar_t> operator "" sv(const wchar_t *__str, size_t __len) _NOEXCEPT`
	`1025`	`+ basic_string_view<wchar_t> operator""sv(const wchar_t *__str, size_t __len) _NOEXCEPT`
`1026`	`1026`	`{`
`1027`	`1027`	`return basic_string_view<wchar_t> (__str, __len);`
`1028`	`1028`	`}`
`1029`	`1029`	`#endif`
`1030`	`1030`
`1031`	`1031`	`#ifndef _LIBCPP_HAS_NO_CHAR8_T`
`1032`	`1032`	`inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR`
`1033`		`- basic_string_view<char8_t> operator "" sv(const char8_t *__str, size_t __len) _NOEXCEPT`
	`1033`	`+ basic_string_view<char8_t> operator""sv(const char8_t *__str, size_t __len) _NOEXCEPT`
`1034`	`1034`	`{`
`1035`	`1035`	`return basic_string_view<char8_t> (__str, __len);`
`1036`	`1036`	`}`
`1037`	`1037`	`#endif`
`1038`	`1038`
`1039`	`1039`	`inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR`
`1040`		`- basic_string_view<char16_t> operator "" sv(const char16_t *__str, size_t __len) _NOEXCEPT`
	`1040`	`+ basic_string_view<char16_t> operator""sv(const char16_t *__str, size_t __len) _NOEXCEPT`
`1041`	`1041`	`{`
`1042`	`1042`	`return basic_string_view<char16_t> (__str, __len);`
`1043`	`1043`	`}`
`1044`	`1044`
`1045`	`1045`	`inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR`
`1046`		`- basic_string_view<char32_t> operator "" sv(const char32_t *__str, size_t __len) _NOEXCEPT`
	`1046`	`+ basic_string_view<char32_t> operator""sv(const char32_t *__str, size_t __len) _NOEXCEPT`
`1047`	`1047`	`{`
`1048`	`1048`	`return basic_string_view<char32_t> (__str, __len);`
`1049`	`1049`	`}`