Skip to content

Commit 9ac5555

Browse files
jensmaurertkoeppe
authored andcommitted
[lib] Drop 'inline' from 'inline constexpr' variable templates.
Since CWG2387, constexpr variable templates have external linkage.
1 parent 4b622b7 commit 9ac5555

File tree

12 files changed

+172
-172
lines changed

12 files changed

+172
-172
lines changed

source/concepts.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@
775775

776776
\begin{itemdecl}
777777
template<class T>
778-
inline constexpr bool @\exposid{is-default-initializable}@ = @\seebelow@; // \expos
778+
constexpr bool @\exposid{is-default-initializable}@ = @\seebelow@; // \expos
779779

780780
template<class T>
781781
concept @\deflibconcept{default_initializable}@ = @\libconcept{constructible_from}@<T> &&

source/containers.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6118,7 +6118,7 @@
61186118
class vector<bool, Allocator>;
61196119

61206120
template<class T>
6121-
inline constexpr bool @\exposid{is-vector-bool-reference}@ = @\seebelow@; // \expos
6121+
constexpr bool @\exposid{is-vector-bool-reference}@ = @\seebelow@; // \expos
61226122

61236123
// hash support
61246124
template<class T> struct hash;
@@ -9346,7 +9346,7 @@
93469346
\indexlibrary{is-vector-bool-reference@\exposid{is-vector-bool-reference}}%
93479347
\begin{itemdecl}
93489348
template<class T>
9349-
inline constexpr bool @\exposid{is-vector-bool-reference}@ = @\seebelow@;
9349+
constexpr bool @\exposid{is-vector-bool-reference}@ = @\seebelow@;
93509350
\end{itemdecl}
93519351

93529352
\begin{itemdescr}
@@ -17520,9 +17520,9 @@
1752017520
class span;
1752117521

1752217522
template<class ElementType, size_t Extent>
17523-
inline constexpr bool ranges::enable_view<span<ElementType, Extent>> = true;
17523+
constexpr bool ranges::enable_view<span<ElementType, Extent>> = true;
1752417524
template<class ElementType, size_t Extent>
17525-
inline constexpr bool ranges::enable_borrowed_range<span<ElementType, Extent>> = true;
17525+
constexpr bool ranges::enable_borrowed_range<span<ElementType, Extent>> = true;
1752617526

1752717527
// \ref{span.objectrep}, views of object representation
1752817528
template<class ElementType, size_t Extent>

source/diagnostics.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -816,9 +816,9 @@
816816

817817
// \ref{syserr}, system error support
818818
template<class T>
819-
inline constexpr bool is_error_code_enum_v = is_error_code_enum<T>::value;
819+
constexpr bool is_error_code_enum_v = is_error_code_enum<T>::value;
820820
template<class T>
821-
inline constexpr bool is_error_condition_enum_v = is_error_condition_enum<T>::value;
821+
constexpr bool is_error_condition_enum_v = is_error_condition_enum<T>::value;
822822
}
823823
\end{codeblock}
824824

source/future.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1368,7 +1368,7 @@
13681368
\begin{codeblock}
13691369
namespace std {
13701370
template<class T> struct is_pod;
1371-
template<class T> inline constexpr bool is_pod_v = is_pod<T>::value;
1371+
template<class T> constexpr bool is_pod_v = is_pod<T>::value;
13721372
template<size_t Len, size_t Align = @\exposid{default-alignment}@> // \seebelow
13731373
struct aligned_storage;
13741374
template<size_t Len, size_t Align = @\exposid{default-alignment}@> // \seebelow

source/iterators.tex

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110

111111
// \ref{iterator.concept.sizedsentinel}, concept \libconcept{sized_sentinel_for}
112112
template<class S, class I>
113-
inline constexpr bool disable_sized_sentinel_for = false; // freestanding
113+
constexpr bool disable_sized_sentinel_for = false; // freestanding
114114

115115
template<class S, class I>
116116
concept sized_sentinel_for = @\seebelow@; // freestanding
@@ -317,7 +317,7 @@
317317

318318
template<class Iterator1, class Iterator2>
319319
requires (!@\libconcept{sized_sentinel_for}@<Iterator1, Iterator2>)
320-
inline constexpr bool disable_sized_sentinel_for<reverse_iterator<Iterator1>, // freestanding
320+
constexpr bool disable_sized_sentinel_for<reverse_iterator<Iterator1>, // freestanding
321321
reverse_iterator<Iterator2>> = true;
322322

323323
// \ref{insert.iterators}, insert iterators
@@ -404,8 +404,8 @@
404404

405405
template<class Iterator1, class Iterator2>
406406
requires (!@\libconcept{sized_sentinel_for}@<Iterator1, Iterator2>)
407-
inline constexpr bool disable_sized_sentinel_for<move_iterator<Iterator1>, // freestanding
408-
move_iterator<Iterator2>> = true;
407+
constexpr bool disable_sized_sentinel_for<move_iterator<Iterator1>, // freestanding
408+
move_iterator<Iterator2>> = true;
409409

410410
template<@\libconcept{semiregular}@ S> class move_sentinel; // freestanding
411411

@@ -1366,10 +1366,10 @@
13661366

13671367
\begin{codeblock}
13681368
template<class T>
1369-
inline constexpr bool @\exposid{is-integer-like}@ = @\seebelow@; @\itcorr[-2]@ // \expos
1369+
constexpr bool @\exposid{is-integer-like}@ = @\seebelow@; @\itcorr[-2]@ // \expos
13701370

13711371
template<class T>
1372-
inline constexpr bool @\exposid{is-signed-integer-like}@ = @\seebelow@; @\itcorr[-2]@ // \expos
1372+
constexpr bool @\exposid{is-signed-integer-like}@ = @\seebelow@; @\itcorr[-2]@ // \expos
13731373

13741374
template<class I>
13751375
concept @\deflibconcept{weakly_incrementable}@ =
@@ -1700,7 +1700,7 @@
17001700
\indexlibraryglobal{disable_sized_sentinel_for}%
17011701
\begin{itemdecl}
17021702
template<class S, class I>
1703-
inline constexpr bool disable_sized_sentinel_for = false;
1703+
constexpr bool disable_sized_sentinel_for = false;
17041704
\end{itemdecl}
17051705

17061706
\begin{itemdescr}

source/memory.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114

115115
// \ref{allocator.uses.trait}, \tcode{uses_allocator}
116116
template<class T, class Alloc>
117-
inline constexpr bool @\libglobal{uses_allocator_v}@ = uses_allocator<T, Alloc>::value; // freestanding
117+
constexpr bool @\libglobal{uses_allocator_v}@ = uses_allocator<T, Alloc>::value; // freestanding
118118

119119
// \ref{allocator.uses.construction}, uses-allocator construction
120120
template<class T, class Alloc, class... Args>

0 commit comments

Comments
 (0)