Skip to content

Commit 5b23f5a

Browse files
wusatosiwusatosi
committed
beman::bad_alloc => std::bad_alloc
1 parent e0ff597 commit 5b23f5a

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

‎tests/beman/inplace_vector/constructors.test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ TYPED_TEST(Constructors, SizedDefault) {
2121

2222
EXPECT_EQ(IV(0), IV{});
2323

24-
EXPECT_THROW(IV(IV::capacity() + 1), beman::bad_alloc);
24+
EXPECT_THROW(IV(IV::capacity() + 1), std::bad_alloc);
2525

2626
constexpr auto mid_size = std::midpoint(0uz, IV::capacity());
2727
IV mid(mid_size);
@@ -63,7 +63,7 @@ TYPED_TEST(Constructors, SizedValue) {
6363
IV device(0, value);
6464
EXPECT_EQ(device, IV{});
6565

66-
EXPECT_THROW(IV(IV::capacity() + 1, value), beman::bad_alloc);
66+
EXPECT_THROW(IV(IV::capacity() + 1, value), std::bad_alloc);
6767
}
6868

6969
if (IV::capacity() < 1)

‎tests/beman/inplace_vector/container_requirements.test.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ TYPED_TEST(SequenceContainerRequirments, ConstructorInitializerList) {
626626
using T = TestFixture::T;
627627

628628
if (IV::capacity() == 0) {
629-
EXPECT_THROW(IV({T{20}}), beman::bad_alloc);
629+
EXPECT_THROW(IV({T{20}}), std::bad_alloc);
630630
return;
631631
}
632632

@@ -657,7 +657,7 @@ TYPED_TEST(SequenceContainerRequirments, AssignInitializerList) {
657657

658658
if (IV::capacity() == 0) {
659659
IV device;
660-
EXPECT_THROW(device = {T{52}}, beman::bad_alloc);
660+
EXPECT_THROW(device = {T{52}}, std::bad_alloc);
661661
return;
662662
}
663663

@@ -786,7 +786,7 @@ TYPED_TEST(SequenceContainerRequirments, AssignIterRange) {
786786
std::array<T, IV::capacity() + 1> ref;
787787
std::copy(correct.begin(), correct.end(), ref.begin());
788788
ref.back() = T{5};
789-
EXPECT_THROW(device.assign(ref.begin(), ref.end()), beman::bad_alloc);
789+
EXPECT_THROW(device.assign(ref.begin(), ref.end()), std::bad_alloc);
790790
}
791791

792792
// a.assign_range(rg)
@@ -814,7 +814,7 @@ TYPED_TEST(SequenceContainerRequirments, AssignRange) {
814814
std::array<T, IV::capacity() + 1> ref;
815815
std::copy(correct.begin(), correct.end(), ref.begin());
816816
ref.back() = T{5};
817-
EXPECT_THROW(device.assign_range(ref), beman::bad_alloc);
817+
EXPECT_THROW(device.assign_range(ref), std::bad_alloc);
818818
}
819819

820820
// a.assign(il)
@@ -827,7 +827,7 @@ TYPED_TEST(SequenceContainerRequirments, AssignFuncInitializerList) {
827827
auto device = this->unique();
828828

829829
if (device.capacity() == 0) {
830-
EXPECT_THROW(device.assign({T{50}}), beman::bad_alloc);
830+
EXPECT_THROW(device.assign({T{50}}), std::bad_alloc);
831831
return;
832832
}
833833

@@ -897,7 +897,7 @@ TYPED_TEST(SequenceContainerRequirments, AssignMulti) {
897897
}
898898

899899
device.clear();
900-
EXPECT_THROW(device.assign(device.capacity() + 1, T{12}), beman::bad_alloc);
900+
EXPECT_THROW(device.assign(device.capacity() + 1, T{12}), std::bad_alloc);
901901
// TODO: Is this defined?
902902
// EXPECT_EQ(device, IV());
903903
}

‎tests/beman/inplace_vector/modifiers.test.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ TYPED_TEST(Modifiers, InsertSingleConstRef) {
4141
}
4242

4343
T val{272};
44-
EXPECT_THROW(device.insert(device.begin(), val), beman::bad_alloc);
44+
EXPECT_THROW(device.insert(device.begin(), val), std::bad_alloc);
4545
EXPECT_EQ(device, reference);
4646

47-
EXPECT_THROW(device.insert(device.begin(), val), beman::bad_alloc);
47+
EXPECT_THROW(device.insert(device.begin(), val), std::bad_alloc);
4848
EXPECT_EQ(device, reference);
4949
}
5050

@@ -81,10 +81,10 @@ TYPED_TEST(Modifiers, InsertSingleRV) {
8181
}
8282
}
8383

84-
EXPECT_THROW(device.insert(device.begin(), T{272}), beman::bad_alloc);
84+
EXPECT_THROW(device.insert(device.begin(), T{272}), std::bad_alloc);
8585
EXPECT_EQ(device, reference);
8686

87-
EXPECT_THROW(device.insert(device.begin(), T{272}), beman::bad_alloc);
87+
EXPECT_THROW(device.insert(device.begin(), T{272}), std::bad_alloc);
8888
EXPECT_EQ(device, reference);
8989
}
9090

@@ -120,10 +120,10 @@ TYPED_TEST(Modifiers, InsertEmplace) {
120120
}
121121
}
122122

123-
EXPECT_THROW(device.emplace(device.begin(), 272), beman::bad_alloc);
123+
EXPECT_THROW(device.emplace(device.begin(), 272), std::bad_alloc);
124124
EXPECT_EQ(device, reference);
125125

126-
EXPECT_THROW(device.emplace(device.begin(), 272), beman::bad_alloc);
126+
EXPECT_THROW(device.emplace(device.begin(), 272), std::bad_alloc);
127127
EXPECT_EQ(device, reference);
128128
}
129129

@@ -160,7 +160,7 @@ TYPED_TEST(Modifiers, InsertMulti) {
160160
}
161161

162162
EXPECT_NO_THROW(device.insert(device.begin(), 0, {2538}));
163-
EXPECT_THROW(device.insert(device.begin(), 1, {2538}), beman::bad_alloc);
163+
EXPECT_THROW(device.insert(device.begin(), 1, {2538}), std::bad_alloc);
164164
}
165165

166166
TYPED_TEST(Modifiers, InsertInitList) {
@@ -200,7 +200,7 @@ TYPED_TEST(Modifiers, InsertInitList) {
200200

201201
auto full = this->unique();
202202
EXPECT_NO_THROW(full.insert(full.begin(), {}));
203-
EXPECT_THROW(full.insert(full.begin(), {T{25}}), beman::bad_alloc);
203+
EXPECT_THROW(full.insert(full.begin(), {T{25}}), std::bad_alloc);
204204
}
205205

206206
TYPED_TEST(Modifiers, InsertRange) {
@@ -257,7 +257,7 @@ TYPED_TEST(Modifiers, InsertRange) {
257257
EXPECT_EQ(device, reference);
258258

259259
EXPECT_THROW(device.insert_range(device.begin(), std::array<T, 1>{T{25}}),
260-
beman::bad_alloc);
260+
std::bad_alloc);
261261
}
262262

263263
TYPED_TEST(Modifiers, InsertItrRange) {
@@ -316,7 +316,7 @@ TYPED_TEST(Modifiers, InsertItrRange) {
316316
std::array<T, 1> single_array{T{25}};
317317
EXPECT_THROW(
318318
device.insert(device.begin(), single_array.begin(), single_array.end()),
319-
beman::bad_alloc);
319+
std::bad_alloc);
320320
}
321321

322322
TYPED_TEST(Modifiers, InsertAppendRange) {
@@ -374,7 +374,7 @@ TYPED_TEST(Modifiers, PushBackConstRef) {
374374
}
375375

376376
T val{0};
377-
EXPECT_THROW(device.push_back(val), beman::bad_alloc);
377+
EXPECT_THROW(device.push_back(val), std::bad_alloc);
378378
}
379379

380380
TYPED_TEST(Modifiers, PushBackRV) {
@@ -400,7 +400,7 @@ TYPED_TEST(Modifiers, PushBackRV) {
400400
}
401401

402402
T val{0};
403-
EXPECT_THROW(device.push_back(val), beman::bad_alloc);
403+
EXPECT_THROW(device.push_back(val), std::bad_alloc);
404404
}
405405

406406
// TODO: Check if there's extra copies
@@ -426,7 +426,7 @@ TYPED_TEST(Modifiers, EmplaceBack) {
426426
EXPECT_EQ(device, IV(reference.begin(), reference.begin() + i + 1));
427427
}
428428

429-
EXPECT_THROW(device.emplace_back(0), beman::bad_alloc);
429+
EXPECT_THROW(device.emplace_back(0), std::bad_alloc);
430430
}
431431

432432
TYPED_TEST(Modifiers, TryEmplaceBack) {
@@ -667,7 +667,7 @@ TYPED_TEST(Modifiers, ReserveNonEmpty) {
667667
device.reserve(device.capacity());
668668
EXPECT_EQ(device, reference);
669669

670-
EXPECT_THROW(device.reserve(device.capacity() + 1), beman::bad_alloc);
670+
EXPECT_THROW(device.reserve(device.capacity() + 1), std::bad_alloc);
671671
}
672672

673673
TYPED_TEST(Modifiers, ReserveEmpty) {
@@ -689,7 +689,7 @@ TYPED_TEST(Modifiers, ReserveEmpty) {
689689
device.reserve(device.capacity());
690690
EXPECT_EQ(device, IV());
691691

692-
EXPECT_THROW(device.reserve(device.capacity() + 1), beman::bad_alloc);
692+
EXPECT_THROW(device.reserve(device.capacity() + 1), std::bad_alloc);
693693
}
694694

695695
TYPED_TEST(Modifiers, ShrinkToFitNonEmpty) {

‎tests/beman/inplace_vector/size_n_data.test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ TYPED_TEST(SizeNCapacity, ResizeUp) {
5656

5757
IV device;
5858

59-
EXPECT_THROW(device.resize(device.capacity() + 1), beman::bad_alloc);
59+
EXPECT_THROW(device.resize(device.capacity() + 1), std::bad_alloc);
6060
EXPECT_EQ(device, IV{});
6161

6262
if (device.capacity() == 0)
@@ -86,7 +86,7 @@ TYPED_TEST(SizeNCapacity, ResizeUp) {
8686
}
8787

8888
IV before_resize(device);
89-
EXPECT_THROW(device.resize(device.capacity() + 1), beman::bad_alloc);
89+
EXPECT_THROW(device.resize(device.capacity() + 1), std::bad_alloc);
9090
EXPECT_EQ(device, before_resize);
9191
}
9292

0 commit comments

Comments
 (0)