Skip to content

Commit e8c9b48

Browse files
committed
コード修飾の衝突回避のためerror_condition型の変数名をec → econdに変更
1 parent f7a9b45 commit e8c9b48

File tree

11 files changed

+70
-68
lines changed

11 files changed

+70
-68
lines changed

reference/future/make_error_condition.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,20 @@ namespace std {
3232
3333
int main()
3434
{
35-
std::error_condition ec = std::make_error_condition(std::future_errc::broken_promise);
35+
std::error_condition econd = std::make_error_condition(std::future_errc::broken_promise);
3636
37-
std::cout << "category : " << ec.category().name() << std::endl;
38-
std::cout << "value : " << ec.value() << std::endl;
39-
std::cout << "message : " << ec.message() << std::endl;
37+
std::cout << "category : " << econd.category().name() << std::endl;
38+
std::cout << "value : " << econd.value() << std::endl;
39+
std::cout << "message : " << econd.message() << std::endl;
4040
}
4141
```
4242
* std::make_error_condition[color ff0000]
4343
* std::error_condition[link /reference/system_error/error_condition.md]
4444
* std::future_errc::broken_promise[link future_errc.md]
45-
* ec.category()[link /reference/system_error/error_condition/category.md]
45+
* econd.category()[link /reference/system_error/error_condition/category.md]
4646
* name()[link /reference/system_error/error_category/name.md]
47-
* ec.value()[link /reference/system_error/error_condition/value.md]
47+
* econd.value()[link /reference/system_error/error_condition/value.md]
48+
* econd.message()[link /reference/system_error/error_condition/message.md]
4849

4950
### 出力例
5051
```

reference/ios/make_error_condition.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@ namespace std {
3131
3232
int main()
3333
{
34-
std::error_condition ec = std::make_error_condition(std::io_errc::stream);
34+
std::error_condition econd = std::make_error_condition(std::io_errc::stream);
3535
36-
std::cout << "category : " << ec.category().name() << std::endl;
37-
std::cout << "value : " << ec.value() << std::endl;
38-
std::cout << "message : " << ec.message() << std::endl;
36+
std::cout << "category : " << econd.category().name() << std::endl;
37+
std::cout << "value : " << econd.value() << std::endl;
38+
std::cout << "message : " << econd.message() << std::endl;
3939
}
4040
```
4141
* std::make_error_condition[color ff0000]
4242
* std::io_errc::stream[link io_errc.md]
4343
* std::error_condition[link /reference/system_error/error_condition.md]
44-
* ec.category()[link /reference/system_error/error_code/category.md]
44+
* econd.category()[link /reference/system_error/error_code/category.md]
4545
* name()[link /reference/system_error/error_category/name.md]
46-
* ec.value()[link /reference/system_error/error_condition/value.md]
46+
* econd.value()[link /reference/system_error/error_condition/value.md]
4747

4848
### 出力例
4949
```

reference/system_error/error_condition/assign.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,26 @@ void assign(int val, const error_category& cat) noexcept;
3333
3434
int main()
3535
{
36-
std::error_condition ec;
36+
std::error_condition econd;
3737
38-
ec.assign(static_cast<int>(std::errc::invalid_argument), std::generic_category());
38+
econd.assign(static_cast<int>(std::errc::invalid_argument), std::generic_category());
3939
40-
if (ec) {
40+
if (econd) {
4141
std::cout << "error" << std::endl;
4242
}
4343
else {
4444
std::cout << "success" << std::endl;
4545
}
4646
47-
std::cout << ec.value() << std::endl;
48-
std::cout << ec.category().name() << std::endl;
47+
std::cout << econd.value() << std::endl;
48+
std::cout << econd.category().name() << std::endl;
4949
}
5050
```
5151
* assign[color ff0000]
5252
* std::errc::invalid_argument[link /reference/system_error/errc.md]
5353
* std::generic_category()[link /reference/system_error/generic_category.md]
54-
* ec.value()[link value.md]
55-
* ec.category()[link category.md]
54+
* econd.value()[link value.md]
55+
* econd.category()[link category.md]
5656
* name()[link /reference/system_error/error_category/name.md]
5757

5858
### 出力

reference/system_error/error_condition/category.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ const error_category& category() const noexcept;
2929

3030
int main()
3131
{
32-
std::error_condition ec(static_cast<int>(std::errc::invalid_argument),
33-
std::generic_category());
32+
std::error_condition econd(static_cast<int>(std::errc::invalid_argument),
33+
std::generic_category());
3434

35-
const std::error_category& cat = ec.category();
35+
const std::error_category& cat = econd.category();
3636
std::cout << cat.name() << std::endl;
3737
}
3838
```

reference/system_error/error_condition/clear.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,27 @@ void clear() noexcept;
3232

3333
int main()
3434
{
35-
std::error_condition ec(static_cast<int>(std::errc::invalid_argument),
36-
std::generic_category());
35+
std::error_condition econd(static_cast<int>(std::errc::invalid_argument),
36+
std::generic_category());
3737

38-
ec.clear();
38+
econd.clear();
3939

40-
if (ec) {
40+
if (econd) {
4141
std::cout << "error" << std::endl;
4242
}
4343
else {
4444
std::cout << "success" << std::endl;
4545
}
4646

47-
std::cout << ec.value() << std::endl;
48-
std::cout << ec.category().name() << std::endl;
47+
std::cout << econd.value() << std::endl;
48+
std::cout << econd.category().name() << std::endl;
4949
}
5050
```
5151
* clear()[color ff0000]
5252
* std::errc::invalid_argument[link /reference/system_error/errc.md]
5353
* std::generic_category()[link /reference/system_error/generic_category.md]
54-
* ec.value()[link value.md]
55-
* ec.category()[link category.md]
54+
* econd.value()[link value.md]
55+
* econd.category()[link category.md]
5656
* name()[link /reference/system_error/error_category/name.md]
5757

5858
### 出力

reference/system_error/error_condition/message.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ category().message(value())
3131
3232
int main()
3333
{
34-
std::error_condition ec(static_cast<int>(std::errc::invalid_argument),
35-
std::generic_category());
34+
std::error_condition econd(static_cast<int>(std::errc::invalid_argument),
35+
std::generic_category());
3636
3737
std::cout << ec.message() << std::endl;
3838
}

reference/system_error/error_condition/op_assign.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,24 +42,24 @@ error_condition& operator=(ErrorConditionEnum e) noexcept;
4242

4343
int main()
4444
{
45-
std::error_condition ec;
45+
std::error_condition econd;
4646

47-
ec = std::errc::invalid_argument;
47+
econd = std::errc::invalid_argument;
4848

49-
if (ec) {
49+
if (econd) {
5050
std::cout << "error" << std::endl;
5151
}
5252
else {
5353
std::cout << "success" << std::endl;
5454
}
5555

56-
std::cout << ec.value() << std::endl;
57-
std::cout << ec.category().name() << std::endl;
56+
std::cout << econd.value() << std::endl;
57+
std::cout << econd.category().name() << std::endl;
5858
}
5959
```
6060
* std::errc::invalid_argument[link /reference/system_error/errc.md]
61-
* ec.value()[link value.md]
62-
* ec.category()[link category.md]
61+
* econd.value()[link value.md]
62+
* econd.category()[link category.md]
6363
* name()[link /reference/system_error/error_category/name.md]
6464

6565
### 出力

reference/system_error/error_condition/op_compare_3way.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ return lhs.value() <=> rhs.value();
4747

4848
int main()
4949
{
50-
std::error_condition ec1 = std::make_error_condition(std::errc::invalid_argument);
51-
std::error_condition ec2 = std::make_error_condition(std::errc::invalid_argument);
52-
std::error_condition ec3 = std::make_error_condition(std::errc::permission_denied);
50+
std::error_condition econd1 = std::make_error_condition(std::errc::invalid_argument);
51+
std::error_condition econd2 = std::make_error_condition(std::errc::invalid_argument);
52+
std::error_condition econd3 = std::make_error_condition(std::errc::permission_denied);
5353

54-
assert((ec1 <=> ec2) == 0);
55-
assert((ec1 <=> ec3) != 0);
54+
assert((econd1 <=> econd2) == 0);
55+
assert((econd1 <=> econd3) != 0);
5656
}
5757
```
5858
* std::make_error_condition[link /reference/system_error/make_error_condition.md]

reference/system_error/error_condition/op_constructor.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,55 +44,55 @@ int main()
4444
// デフォルトコンストラクタ
4545
std::cout << "default ctor" << std::endl;
4646
{
47-
std::error_condition ec;
47+
std::error_condition econd;
4848
49-
if (ec) {
49+
if (econd) {
5050
std::cout << "error" << std::endl;
5151
}
5252
else {
5353
std::cout << "success" << std::endl;
5454
}
5555
56-
std::cout << ec.value() << std::endl;
57-
std::cout << ec.category().name() << std::endl;
56+
std::cout << econd.value() << std::endl;
57+
std::cout << econd.category().name() << std::endl;
5858
}
5959
6060
// エラー値とエラーカテゴリを受け取って構築
6161
std::cout << std::endl << "value & category ctor" << std::endl;
6262
{
63-
std::error_condition ec(static_cast<int>(std::errc::invalid_argument),
64-
std::generic_category());
63+
std::error_condition econd(static_cast<int>(std::errc::invalid_argument),
64+
std::generic_category());
6565
66-
if (ec) {
66+
if (econd) {
6767
std::cout << "error" << std::endl;
6868
}
6969
else {
7070
std::cout << "success" << std::endl;
7171
}
7272
73-
std::cout << ec.value() << std::endl;
74-
std::cout << ec.category().name() << std::endl;
73+
std::cout << econd.value() << std::endl;
74+
std::cout << econd.category().name() << std::endl;
7575
}
7676
7777
// is_error_condition_enumが特殊化された型のエラー値を受け取って構築
7878
std::cout << std::endl << "ErrorConditionEnum ctor" << std::endl;
7979
{
80-
std::error_condition ec(std::errc::invalid_argument);
80+
std::error_condition econd(std::errc::invalid_argument);
8181
82-
if (ec) {
82+
if (econd) {
8383
std::cout << "error" << std::endl;
8484
}
8585
else {
8686
std::cout << "success" << std::endl;
8787
}
8888
89-
std::cout << ec.value() << std::endl;
90-
std::cout << ec.category().name() << std::endl;
89+
std::cout << econd.value() << std::endl;
90+
std::cout << econd.category().name() << std::endl;
9191
}
9292
}
9393
```
94-
* ec.value()[link value.md]
95-
* ec.category()[link category.md]
94+
* econd.value()[link value.md]
95+
* econd.category()[link category.md]
9696
* name()[link /reference/system_error/error_category/name.md]
9797
* std::errc::invalid_argument[link /reference/system_error/errc.md]
9898
* std::generic_category()[link /reference/system_error/generic_category.md]

reference/system_error/error_condition/value.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ int value() const noexcept;
2828

2929
int main()
3030
{
31-
std::error_condition ec(static_cast<int>(std::errc::invalid_argument),
32-
std::generic_category());
31+
std::error_condition econd(static_cast<int>(std::errc::invalid_argument),
32+
std::generic_category());
3333

34-
std::cout << ec.value() << std::endl;
34+
std::cout << econd.value() << std::endl;
3535
}
3636
```
3737
* value()[color ff0000]

0 commit comments

Comments
 (0)