Skip to content

Commit 9c988ba

Browse files
committed
Merge branch 'master' into contribution_stats_2025
2 parents aa98a7f + 29e9569 commit 9c988ba

File tree

9 files changed

+202
-11
lines changed

9 files changed

+202
-11
lines changed

lang/cpp26/feature_test_macros.md

Lines changed: 190 additions & 0 deletions
Large diffs are not rendered by default.

reference/algorithm/count_if.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ int main() {
5353
}
5454
```
5555
* std::count_if[color ff0000]
56-
* std::count_if[link /reference/algorithm/count_if.md]
5756

5857
### 出力
5958
```cpp

reference/algorithm/lexicographical_compare_three_way.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,12 @@ int main() {
118118
* std::isalpha[link /reference/cctype/isalpha.md]
119119
* std::tolower[link /reference/cctype/tolower.md]
120120
* weak_ordering[link /reference/compare/weak_ordering.md]
121-
* str1.begin[link /reference/string/string/begin.md.nolink]
122-
* str1.end[link /reference/string/string/end.md.nolink]
123-
* str2.begin[link /reference/string/string/begin.md.nolink]
124-
* str2.end[link /reference/string/string/end.md.nolink]
125-
* str3.begin[link /reference/string/string/begin.md.nolink]
126-
* str3.end[link /reference/string/string/end.md.nolink]
121+
* str1.begin[link /reference/string/basic_string/begin.md]
122+
* str1.end[link /reference/string/basic_string/end.md]
123+
* str2.begin[link /reference/string/basic_string/begin.md]
124+
* str2.end[link /reference/string/basic_string/end.md]
125+
* str3.begin[link /reference/string/basic_string/begin.md]
126+
* str3.end[link /reference/string/basic_string/end.md]
127127

128128
### 出力例
129129
```

reference/algorithm/move.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ int main() {
7373
```
7474
* std::move[color ff0000]
7575
* v.emplace_back[link /reference/vector/vector/emplace_back.md]
76-
* v.emplace_back[link /reference/vector/vector/emplace_back.md]
7776

7877
### 出力
7978
```

reference/algorithm/partition_copy.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ int main()
106106
}
107107
```
108108
* std::partition_copy[color ff0000]
109-
* is_even[link /reference/algorithm/is_partitioned.md]
110109

111110
### 出力
112111
```

reference/memory/enable_shared_from_this.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ int main()
8383
}
8484
```
8585
* std::enable_shared_from_this[color ff0000]
86+
* shared_from_this()[link enable_shared_from_this/shared_from_this.md]
8687
8788
### 出力
8889
```

reference/optional/optional/op_compare_3way.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ namespace std {
1212

1313
template <class T>
1414
constexpr strong_ordering
15-
operator<=>(const optional<T>&, nullopt_t) noexcept; // (2) C++20
15+
operator<=>(const optional<T>& x, nullopt_t) noexcept; // (2) C++20
1616

1717
template <class T, three_way_comparable_with<T> U>
1818
constexpr compare_three_way_result_t<T,U>
19-
operator<=>(const optional<T>& x, const U& y); // (3) C++20
19+
operator<=>(const optional<T>& x, const U& v); // (3) C++20
2020
}
2121
```
2222
* nullopt_t[link /reference/optional/nullopt_t.md]

reference/stop_token/stop_source/op_constructor.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ explicit stop_source(nostopstate_t) noexcept; // (2)
1111
stop_source(const stop_source& rhs) noexcept; // (3)
1212
stop_source(stop_source&& rhs) noexcept; // (4)
1313
```
14+
* nostopstate_t[link ../nostopstate.md]
1415
1516
## 概要
1617
- (1) : デフォルトコンストラクタ。停止状態を表すリソースを新たに確保して所有する。
@@ -56,6 +57,7 @@ int main()
5657
* std::move[link /reference/utility/move.md]
5758
* std::stop_source[link ../stop_source.md]
5859
* std::nostopstate[link ../nostopstate.md]
60+
* stop_possible()[link stop_possible.md]
5961
* stop_requested()[link stop_requested.md]
6062
* request_stop()[link request_stop.md]
6163

reference/version.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
- [C++17 機能テストマクロ](/lang/cpp17/feature_test_macros.md)
1515
- [C++20 機能テストマクロ](/lang/cpp20/feature_test_macros.md)
1616
- [C++23 機能テストマクロ](/lang/cpp23/feature_test_macros.md)
17+
- [C++26 機能テストマクロ](/lang/cpp26/feature_test_macros.md)
1718

1819
## 参照
1920
- [P0754R2 `<version>`](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0754r2.pdf)

0 commit comments

Comments
 (0)