Skip to content

Commit faa67d5

Browse files
committed
Consistently use 'operator""x' rather than 'operator "" x' throughout standard.
We must remove the second space for 'operator""if', because 'operator "" if' is not valid, and should have a single consistent style. Evidence suggests that people either put spaces both before and after the "" or in neither place, so the only uniform consistent common style is this one. Fixes wrong index entry for 'operator""if' and bad collation.
1 parent b34c9f9 commit faa67d5

File tree

3 files changed

+57
-57
lines changed

3 files changed

+57
-57
lines changed

source/numerics.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1326,7 +1326,7 @@
13261326
\tcode{complex<float>} respectively, with their imaginary part denoted by the
13271327
given literal number and the real part being zero.
13281328

1329-
\indexlibrarymember{operator """" il}{complex}%
1329+
\indexlibrarymember{operator""""il}{complex}%
13301330
\begin{itemdecl}
13311331
constexpr complex<long double> operator""il(long double d);
13321332
constexpr complex<long double> operator""il(unsigned long long d);
@@ -1338,7 +1338,7 @@
13381338
\tcode{complex<long double>\{0.0L, static_cast<long double>(d)\}}.
13391339
\end{itemdescr}
13401340

1341-
\indexlibrarymember{operator """" i}{complex}%
1341+
\indexlibrarymember{operator""""i}{complex}%
13421342
\begin{itemdecl}
13431343
constexpr complex<double> operator""i(long double d);
13441344
constexpr complex<double> operator""i(unsigned long long d);
@@ -1350,7 +1350,7 @@
13501350
\tcode{complex<double>\{0.0, static_cast<double>(d)\}}.
13511351
\end{itemdescr}
13521352

1353-
\indexlibrarymember{operator """" if}{complex}%
1353+
\indexlibrarymember{operator""""if}{complex}%
13541354
\begin{itemdecl}
13551355
constexpr complex<float> operator""if(long double d);
13561356
constexpr complex<float> operator""if(unsigned long long d);

source/strings.tex

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -809,10 +809,10 @@
809809
inline namespace literals {
810810
inline namespace string_literals {
811811
// \ref{basic.string.literals}, suffix for \tcode{basic_string} literals
812-
string operator "" s(const char* str, size_t len);
813-
u16string operator "" s(const char16_t* str, size_t len);
814-
u32string operator "" s(const char32_t* str, size_t len);
815-
wstring operator "" s(const wchar_t* str, size_t len);
812+
string operator""s(const char* str, size_t len);
813+
u16string operator""s(const char16_t* str, size_t len);
814+
u32string operator""s(const char32_t* str, size_t len);
815+
wstring operator""s(const wchar_t* str, size_t len);
816816
}
817817
}
818818
}
@@ -4593,9 +4593,9 @@
45934593

45944594
\rSec2[basic.string.literals]{Suffix for \tcode{basic_string} literals}
45954595

4596-
\indexlibrarymember{operator """" s}{string}%
4596+
\indexlibrarymember{operator""""s}{string}%
45974597
\begin{itemdecl}
4598-
string operator "" s(const char* str, size_t len);
4598+
string operator""s(const char* str, size_t len);
45994599
\end{itemdecl}
46004600

46014601
\begin{itemdescr}
@@ -4604,29 +4604,29 @@
46044604
\tcode{string\{str, len\}}.
46054605
\end{itemdescr}
46064606

4607-
\indexlibrarymember{operator """" s}{u16string}%
4607+
\indexlibrarymember{operator""""s}{u16string}%
46084608
\begin{itemdecl}
4609-
u16string operator "" s(const char16_t* str, size_t len);
4609+
u16string operator""s(const char16_t* str, size_t len);
46104610
\end{itemdecl}
46114611
\begin{itemdescr}
46124612
\pnum
46134613
\returns
46144614
\tcode{u16string\{str, len\}}.
46154615
\end{itemdescr}
46164616

4617-
\indexlibrarymember{operator """" s}{u32string}%
4617+
\indexlibrarymember{operator""""s}{u32string}%
46184618
\begin{itemdecl}
4619-
u32string operator "" s(const char32_t* str, size_t len);
4619+
u32string operator""s(const char32_t* str, size_t len);
46204620
\end{itemdecl}
46214621
\begin{itemdescr}
46224622
\pnum
46234623
\returns
46244624
\tcode{u32string\{str, len\}}.
46254625
\end{itemdescr}
46264626

4627-
\indexlibrarymember{operator """" s}{wstring}%
4627+
\indexlibrarymember{operator""""s}{wstring}%
46284628
\begin{itemdecl}
4629-
wstring operator "" s(const wchar_t* str, size_t len);
4629+
wstring operator""s(const wchar_t* str, size_t len);
46304630
\end{itemdecl}
46314631
\begin{itemdescr}
46324632
\pnum
@@ -4706,10 +4706,10 @@
47064706
inline namespace literals {
47074707
inline namespace string_view_literals {
47084708
// \ref{string.view.literals}, suffix for \tcode{basic_string_view} literals
4709-
constexpr string_view operator "" sv(const char* str, size_t len) noexcept;
4710-
constexpr u16string_view operator "" sv(const char16_t* str, size_t len) noexcept;
4711-
constexpr u32string_view operator "" sv(const char32_t* str, size_t len) noexcept;
4712-
constexpr wstring_view operator "" sv(const wchar_t* str, size_t len) noexcept;
4709+
constexpr string_view operator""sv(const char* str, size_t len) noexcept;
4710+
constexpr u16string_view operator""sv(const char16_t* str, size_t len) noexcept;
4711+
constexpr u32string_view operator""sv(const char32_t* str, size_t len) noexcept;
4712+
constexpr wstring_view operator""sv(const wchar_t* str, size_t len) noexcept;
47134713
}
47144714
}
47154715
}
@@ -5654,9 +5654,9 @@
56545654

56555655
\rSec2[string.view.literals]{Suffix for \tcode{basic_string_view} literals}
56565656

5657-
\indexlibrarymember{operator """" sv}{string_view}%
5657+
\indexlibrarymember{operator""""sv}{string_view}%
56585658
\begin{itemdecl}
5659-
constexpr string_view operator "" sv(const char* str, size_t len) noexcept;
5659+
constexpr string_view operator""sv(const char* str, size_t len) noexcept;
56605660
\end{itemdecl}
56615661

56625662
\begin{itemdescr}
@@ -5665,29 +5665,29 @@
56655665
\tcode{string_view\{str, len\}}.
56665666
\end{itemdescr}
56675667

5668-
\indexlibrarymember{operator """" sv}{u16string_view}%
5668+
\indexlibrarymember{operator""""sv}{u16string_view}%
56695669
\begin{itemdecl}
5670-
constexpr u16string_view operator "" sv(const char16_t* str, size_t len) noexcept;
5670+
constexpr u16string_view operator""sv(const char16_t* str, size_t len) noexcept;
56715671
\end{itemdecl}
56725672
\begin{itemdescr}
56735673
\pnum
56745674
\returns
56755675
\tcode{u16string_view\{str, len\}}.
56765676
\end{itemdescr}
56775677

5678-
\indexlibrarymember{operator """" sv}{u32string_view}%
5678+
\indexlibrarymember{operator""""sv}{u32string_view}%
56795679
\begin{itemdecl}
5680-
constexpr u32string_view operator "" sv(const char32_t* str, size_t len) noexcept;
5680+
constexpr u32string_view operator""sv(const char32_t* str, size_t len) noexcept;
56815681
\end{itemdecl}
56825682
\begin{itemdescr}
56835683
\pnum
56845684
\returns
56855685
\tcode{u32string_view\{str, len\}}.
56865686
\end{itemdescr}
56875687

5688-
\indexlibrarymember{operator """" sv}{wstring_view}%
5688+
\indexlibrarymember{operator""""sv}{wstring_view}%
56895689
\begin{itemdecl}
5690-
constexpr wstring_view operator "" sv(const wchar_t* str, size_t len) noexcept;
5690+
constexpr wstring_view operator""sv(const wchar_t* str, size_t len) noexcept;
56915691
\end{itemdecl}
56925692
\begin{itemdescr}
56935693
\pnum

source/utilities.tex

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17503,18 +17503,18 @@
1750317503
inline namespace literals {
1750417504
inline namespace chrono_literals {
1750517505
// \ref{time.duration.literals}, suffixes for duration literals
17506-
constexpr chrono::hours operator "" h(unsigned long long);
17507-
constexpr chrono::duration<@\unspec,@ ratio<3600,1>> operator "" h(long double);
17508-
constexpr chrono::minutes operator "" min(unsigned long long);
17509-
constexpr chrono::duration<@\unspec,@ ratio<60,1>> operator "" min(long double);
17510-
constexpr chrono::seconds operator "" s(unsigned long long);
17511-
constexpr chrono::duration<@\unspec@> @\itcorr[-1]@ operator "" s(long double);
17512-
constexpr chrono::milliseconds operator "" ms(unsigned long long);
17513-
constexpr chrono::duration<@\unspec,@ milli> operator "" ms(long double);
17514-
constexpr chrono::microseconds operator "" us(unsigned long long);
17515-
constexpr chrono::duration<@\unspec,@ micro> operator "" us(long double);
17516-
constexpr chrono::nanoseconds operator "" ns(unsigned long long);
17517-
constexpr chrono::duration<@\unspec,@ nano> operator "" ns(long double);
17506+
constexpr chrono::hours operator""h(unsigned long long);
17507+
constexpr chrono::duration<@\unspec,@ ratio<3600,1>> operator""h(long double);
17508+
constexpr chrono::minutes operator""min(unsigned long long);
17509+
constexpr chrono::duration<@\unspec,@ ratio<60,1>> operator""min(long double);
17510+
constexpr chrono::seconds operator""s(unsigned long long);
17511+
constexpr chrono::duration<@\unspec@> @\itcorr[-1]@ operator""s(long double);
17512+
constexpr chrono::milliseconds operator""ms(unsigned long long);
17513+
constexpr chrono::duration<@\unspec,@ milli> operator""ms(long double);
17514+
constexpr chrono::microseconds operator""us(unsigned long long);
17515+
constexpr chrono::duration<@\unspec,@ micro> operator""us(long double);
17516+
constexpr chrono::nanoseconds operator""ns(unsigned long long);
17517+
constexpr chrono::duration<@\unspec,@ nano> operator""ns(long double);
1751817518
}
1751917519
}
1752017520

@@ -18400,10 +18400,10 @@
1840018400
\end{codeblock}
1840118401
\end{example}
1840218402

18403-
\indexlibrarymember{operator """" h}{duration}%
18403+
\indexlibrarymember{operator""""h}{duration}%
1840418404
\begin{itemdecl}
18405-
constexpr chrono::hours operator "" h(unsigned long long hours);
18406-
constexpr chrono::duration<@\unspec,@ ratio<3600, 1>> operator "" h(long double hours);
18405+
constexpr chrono::hours operator""h(unsigned long long hours);
18406+
constexpr chrono::duration<@\unspec,@ ratio<3600, 1>> operator""h(long double hours);
1840718407
\end{itemdecl}
1840818408

1840918409
\begin{itemdescr}
@@ -18412,10 +18412,10 @@
1841218412
A \tcode{duration} literal representing \tcode{hours} hours.
1841318413
\end{itemdescr}
1841418414

18415-
\indexlibrarymember{operator """" min}{duration}%
18415+
\indexlibrarymember{operator""""min}{duration}%
1841618416
\begin{itemdecl}
18417-
constexpr chrono::minutes operator "" min(unsigned long long minutes);
18418-
constexpr chrono::duration<@\unspec,@ ratio<60, 1>> operator "" min(long double minutes);
18417+
constexpr chrono::minutes operator""min(unsigned long long minutes);
18418+
constexpr chrono::duration<@\unspec,@ ratio<60, 1>> operator""min(long double minutes);
1841918419
\end{itemdecl}
1842018420

1842118421
\begin{itemdescr}
@@ -18424,10 +18424,10 @@
1842418424
A \tcode{duration} literal representing \tcode{minutes} minutes.
1842518425
\end{itemdescr}
1842618426

18427-
\indexlibrarymember{operator """" s}{duration}%
18427+
\indexlibrarymember{operator""""s}{duration}%
1842818428
\begin{itemdecl}
18429-
constexpr chrono::seconds @\itcorr@ operator "" s(unsigned long long sec);
18430-
constexpr chrono::duration<@\unspec@> operator "" s(long double sec);
18429+
constexpr chrono::seconds @\itcorr@ operator""s(unsigned long long sec);
18430+
constexpr chrono::duration<@\unspec@> operator""s(long double sec);
1843118431
\end{itemdecl}
1843218432

1843318433
\begin{itemdescr}
@@ -18443,10 +18443,10 @@
1844318443
\end{note}
1844418444
\end{itemdescr}
1844518445

18446-
\indexlibrarymember{operator """" ms}{duration}%
18446+
\indexlibrarymember{operator""""ms}{duration}%
1844718447
\begin{itemdecl}
18448-
constexpr chrono::milliseconds operator "" ms(unsigned long long msec);
18449-
constexpr chrono::duration<@\unspec,@ milli> operator "" ms(long double msec);
18448+
constexpr chrono::milliseconds operator""ms(unsigned long long msec);
18449+
constexpr chrono::duration<@\unspec,@ milli> operator""ms(long double msec);
1845018450
\end{itemdecl}
1845118451

1845218452
\begin{itemdescr}
@@ -18455,10 +18455,10 @@
1845518455
A \tcode{duration} literal representing \tcode{msec} milliseconds.
1845618456
\end{itemdescr}
1845718457

18458-
\indexlibrarymember{operator """" us}{duration}%
18458+
\indexlibrarymember{operator""""us}{duration}%
1845918459
\begin{itemdecl}
18460-
constexpr chrono::microseconds operator "" us(unsigned long long usec);
18461-
constexpr chrono::duration<@\unspec,@ micro> operator "" us(long double usec);
18460+
constexpr chrono::microseconds operator""us(unsigned long long usec);
18461+
constexpr chrono::duration<@\unspec,@ micro> operator""us(long double usec);
1846218462
\end{itemdecl}
1846318463

1846418464
\begin{itemdescr}
@@ -18467,10 +18467,10 @@
1846718467
A \tcode{duration} literal representing \tcode{usec} microseconds.
1846818468
\end{itemdescr}
1846918469

18470-
\indexlibrarymember{operator """" ns}{duration}%
18470+
\indexlibrarymember{operator""""ns}{duration}%
1847118471
\begin{itemdecl}
18472-
constexpr chrono::nanoseconds operator "" ns(unsigned long long nsec);
18473-
constexpr chrono::duration<@\unspec,@ nano> operator "" ns(long double nsec);
18472+
constexpr chrono::nanoseconds operator""ns(unsigned long long nsec);
18473+
constexpr chrono::duration<@\unspec,@ nano> operator""ns(long double nsec);
1847418474
\end{itemdecl}
1847518475

1847618476
\begin{itemdescr}

0 commit comments

Comments
 (0)