Skip to content

Commit 5699c83

Browse files
committed
fix(wasm): Throw => THROW
1 parent 10f7226 commit 5699c83

5 files changed

Lines changed: 45 additions & 45 deletions

File tree

include/msgpack/v1/adaptor/boost/msgpack_variant.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ struct basic_variant :
196196
if (is_uint64_t()) {
197197
return static_cast<double>(boost::get<uint64_t>(*this));
198198
}
199-
throw msgpack::type_error();
199+
THROW msgpack::type_error();
200200
}
201201
std::string const& as_string() const {
202202
return boost::get<std::string>(*this);

include/msgpack/v1/adaptor/cpp11/chrono.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@ template <
120120
>
121121
Target integral_cast(Source source) {
122122
if (would_underflow<Target, Source>(source).value) {
123-
throw std::underflow_error{
123+
THROW std::underflow_error{
124124
"casting from Source to Target causes an underflow error"
125125
};
126126
}
127127
if(would_overflow<Target, Source>(source).value) {
128-
throw std::overflow_error{
128+
THROW std::overflow_error{
129129
"casting from Source to Target causes an overflow error"
130130
};
131131
}

include/msgpack/v1/adaptor/cpp17/variant.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ struct as<std::variant<Ts...>, typename std::enable_if<(msgpack::has_as<Ts>::val
7676
|| o.via.array.size != 2
7777
|| o.via.array.ptr[0].type != msgpack::type::POSITIVE_INTEGER
7878
|| o.via.array.ptr[0].via.u64 >= sizeof...(Ts)) {
79-
throw msgpack::type_error{};
79+
THROW msgpack::type_error{};
8080
}
8181

8282
return detail::construct_variant<std::variant<Ts...>, Ts...>(
@@ -94,7 +94,7 @@ struct convert<std::variant<Ts...>> {
9494
|| o.via.array.size != 2
9595
|| o.via.array.ptr[0].type != msgpack::type::POSITIVE_INTEGER
9696
|| o.via.array.ptr[0].via.u64 >= sizeof...(Ts)) {
97-
throw msgpack::type_error{};
97+
THROW msgpack::type_error{};
9898
}
9999

100100
v = detail::construct_variant<std::variant<Ts...>, Ts...>(

include/msgpack/v1/detail/cpp03_zone.hpp

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class zone {
135135

136136
static void* operator new(std::size_t size) {
137137
void* p = ::malloc(size);
138-
if (!p) throw std::bad_alloc();
138+
if (!p) THROW std::bad_alloc();
139139
return p;
140140
}
141141

@@ -243,7 +243,7 @@ inline zone::chunk_list& zone::get_chank_lst() {
243243
if (!m_chunk_list) {
244244
void* ptr = ::malloc(sizeof(chunk_list) + m_chunk_size);
245245
if (!ptr)
246-
throw std::bad_alloc();
246+
THROW std::bad_alloc();
247247
m_chunk_list = new (ptr) chunk_list(m_chunk_size, reinterpret_cast<char*>(ptr) + sizeof(chunk_list));
248248
}
249249
return *m_chunk_list;
@@ -290,7 +290,7 @@ inline char* zone::allocate_expand(size_t size) {
290290
}
291291

292292
chunk* c = static_cast<chunk*>(::malloc(sizeof(chunk) + sz));
293-
if (!c) throw std::bad_alloc();
293+
if (!c) THROW std::bad_alloc();
294294

295295
char* ptr = reinterpret_cast<char*>(c) + sizeof(chunk);
296296

@@ -355,14 +355,14 @@ T* zone::allocate()
355355
m_finalizer_array.push(&zone::object_destruct<T>, x);
356356
} catch (...) {
357357
undo_allocate(sizeof(T));
358-
throw;
358+
RETHROW;
359359
}
360360
try {
361361
return new (x) T();
362362
} catch (...) {
363363
m_finalizer_array.pop();
364364
undo_allocate(sizeof(T));
365-
throw;
365+
RETHROW;
366366
}
367367
}
368368

@@ -374,14 +374,14 @@ T* zone::allocate(A1 a1)
374374
m_finalizer_array.push(&zone::object_destruct<T>, x);
375375
} catch (...) {
376376
undo_allocate(sizeof(T));
377-
throw;
377+
RETHROW;
378378
}
379379
try {
380380
return new (x) T(a1);
381381
} catch (...) {
382382
m_finalizer_array.pop();
383383
undo_allocate(sizeof(T));
384-
throw;
384+
RETHROW;
385385
}
386386
}
387387

@@ -393,14 +393,14 @@ T* zone::allocate(A1 a1, A2 a2)
393393
m_finalizer_array.push(&zone::object_destruct<T>, x);
394394
} catch (...) {
395395
undo_allocate(sizeof(T));
396-
throw;
396+
RETHROW;
397397
}
398398
try {
399399
return new (x) T(a1, a2);
400400
} catch (...) {
401401
m_finalizer_array.pop();
402402
undo_allocate(sizeof(T));
403-
throw;
403+
RETHROW;
404404
}
405405
}
406406

@@ -412,14 +412,14 @@ T* zone::allocate(A1 a1, A2 a2, A3 a3)
412412
m_finalizer_array.push(&zone::object_destruct<T>, x);
413413
} catch (...) {
414414
undo_allocate(sizeof(T));
415-
throw;
415+
RETHROW;
416416
}
417417
try {
418418
return new (x) T(a1, a2, a3);
419419
} catch (...) {
420420
m_finalizer_array.pop();
421421
undo_allocate(sizeof(T));
422-
throw;
422+
RETHROW;
423423
}
424424
}
425425

@@ -431,14 +431,14 @@ T* zone::allocate(A1 a1, A2 a2, A3 a3, A4 a4)
431431
m_finalizer_array.push(&zone::object_destruct<T>, x);
432432
} catch (...) {
433433
undo_allocate(sizeof(T));
434-
throw;
434+
RETHROW;
435435
}
436436
try {
437437
return new (x) T(a1, a2, a3, a4);
438438
} catch (...) {
439439
m_finalizer_array.pop();
440440
undo_allocate(sizeof(T));
441-
throw;
441+
RETHROW;
442442
}
443443
}
444444

@@ -450,14 +450,14 @@ T* zone::allocate(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
450450
m_finalizer_array.push(&zone::object_destruct<T>, x);
451451
} catch (...) {
452452
undo_allocate(sizeof(T));
453-
throw;
453+
RETHROW;
454454
}
455455
try {
456456
return new (x) T(a1, a2, a3, a4, a5);
457457
} catch (...) {
458458
m_finalizer_array.pop();
459459
undo_allocate(sizeof(T));
460-
throw;
460+
RETHROW;
461461
}
462462
}
463463

@@ -469,14 +469,14 @@ T* zone::allocate(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6)
469469
m_finalizer_array.push(&zone::object_destruct<T>, x);
470470
} catch (...) {
471471
undo_allocate(sizeof(T));
472-
throw;
472+
RETHROW;
473473
}
474474
try {
475475
return new (x) T(a1, a2, a3, a4, a5, a6);
476476
} catch (...) {
477477
m_finalizer_array.pop();
478478
undo_allocate(sizeof(T));
479-
throw;
479+
RETHROW;
480480
}
481481
}
482482

@@ -488,14 +488,14 @@ T* zone::allocate(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7)
488488
m_finalizer_array.push(&zone::object_destruct<T>, x);
489489
} catch (...) {
490490
undo_allocate(sizeof(T));
491-
throw;
491+
RETHROW;
492492
}
493493
try {
494494
return new (x) T(a1, a2, a3, a4, a5, a6, a7);
495495
} catch (...) {
496496
m_finalizer_array.pop();
497497
undo_allocate(sizeof(T));
498-
throw;
498+
RETHROW;
499499
}
500500
}
501501

@@ -507,14 +507,14 @@ T* zone::allocate(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8)
507507
m_finalizer_array.push(&zone::object_destruct<T>, x);
508508
} catch (...) {
509509
undo_allocate(sizeof(T));
510-
throw;
510+
RETHROW;
511511
}
512512
try {
513513
return new (x) T(a1, a2, a3, a4, a5, a6, a7, a8);
514514
} catch (...) {
515515
m_finalizer_array.pop();
516516
undo_allocate(sizeof(T));
517-
throw;
517+
RETHROW;
518518
}
519519
}
520520

@@ -526,14 +526,14 @@ T* zone::allocate(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9)
526526
m_finalizer_array.push(&zone::object_destruct<T>, x);
527527
} catch (...) {
528528
undo_allocate(sizeof(T));
529-
throw;
529+
RETHROW;
530530
}
531531
try {
532532
return new (x) T(a1, a2, a3, a4, a5, a6, a7, a8, a9);
533533
} catch (...) {
534534
m_finalizer_array.pop();
535535
undo_allocate(sizeof(T));
536-
throw;
536+
RETHROW;
537537
}
538538
}
539539

@@ -545,14 +545,14 @@ T* zone::allocate(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9,
545545
m_finalizer_array.push(&zone::object_destruct<T>, x);
546546
} catch (...) {
547547
undo_allocate(sizeof(T));
548-
throw;
548+
RETHROW;
549549
}
550550
try {
551551
return new (x) T(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
552552
} catch (...) {
553553
m_finalizer_array.pop();
554554
undo_allocate(sizeof(T));
555-
throw;
555+
RETHROW;
556556
}
557557
}
558558

@@ -564,14 +564,14 @@ T* zone::allocate(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9,
564564
m_finalizer_array.push(&zone::object_destruct<T>, x);
565565
} catch (...) {
566566
undo_allocate(sizeof(T));
567-
throw;
567+
RETHROW;
568568
}
569569
try {
570570
return new (x) T(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);
571571
} catch (...) {
572572
m_finalizer_array.pop();
573573
undo_allocate(sizeof(T));
574-
throw;
574+
RETHROW;
575575
}
576576
}
577577

@@ -583,14 +583,14 @@ T* zone::allocate(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9,
583583
m_finalizer_array.push(&zone::object_destruct<T>, x);
584584
} catch (...) {
585585
undo_allocate(sizeof(T));
586-
throw;
586+
RETHROW;
587587
}
588588
try {
589589
return new (x) T(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12);
590590
} catch (...) {
591591
m_finalizer_array.pop();
592592
undo_allocate(sizeof(T));
593-
throw;
593+
RETHROW;
594594
}
595595
}
596596

@@ -602,14 +602,14 @@ T* zone::allocate(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9,
602602
m_finalizer_array.push(&zone::object_destruct<T>, x);
603603
} catch (...) {
604604
undo_allocate(sizeof(T));
605-
throw;
605+
RETHROW;
606606
}
607607
try {
608608
return new (x) T(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13);
609609
} catch (...) {
610610
m_finalizer_array.pop();
611611
undo_allocate(sizeof(T));
612-
throw;
612+
RETHROW;
613613
}
614614
}
615615

@@ -621,14 +621,14 @@ T* zone::allocate(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9,
621621
m_finalizer_array.push(&zone::object_destruct<T>, x);
622622
} catch (...) {
623623
undo_allocate(sizeof(T));
624-
throw;
624+
RETHROW;
625625
}
626626
try {
627627
return new (x) T(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14);
628628
} catch (...) {
629629
m_finalizer_array.pop();
630630
undo_allocate(sizeof(T));
631-
throw;
631+
RETHROW;
632632
}
633633
}
634634

@@ -640,14 +640,14 @@ T* zone::allocate(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9,
640640
m_finalizer_array.push(&zone::object_destruct<T>, x);
641641
} catch (...) {
642642
undo_allocate(sizeof(T));
643-
throw;
643+
RETHROW;
644644
}
645645
try {
646646
return new (x) T(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15);
647647
} catch (...) {
648648
m_finalizer_array.pop();
649649
undo_allocate(sizeof(T));
650-
throw;
650+
RETHROW;
651651
}
652652
}
653653

include/msgpack/v1/detail/cpp11_zone.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ class zone {
147147

148148
static void* operator new(std::size_t size) {
149149
void* p = ::malloc(size);
150-
if (!p) throw std::bad_alloc();
150+
if (!p) THROW std::bad_alloc();
151151
return p;
152152
}
153153

@@ -208,7 +208,7 @@ inline zone::chunk_list& zone::get_chank_lst() {
208208
if (!m_chunk_list) {
209209
auto ptr = ::malloc(sizeof(chunk_list) + m_chunk_size);
210210
if (!ptr)
211-
throw std::bad_alloc();
211+
THROW std::bad_alloc();
212212
m_chunk_list = new (ptr) chunk_list(m_chunk_size, reinterpret_cast<char*>(ptr) + sizeof(chunk_list));
213213
}
214214
return *m_chunk_list;
@@ -255,7 +255,7 @@ inline char* zone::allocate_expand(size_t size) {
255255
}
256256

257257
chunk* c = static_cast<chunk*>(::malloc(sizeof(chunk) + sz));
258-
if (!c) throw std::bad_alloc();
258+
if (!c) THROW std::bad_alloc();
259259

260260
char* ptr = reinterpret_cast<char*>(c) + sizeof(chunk);
261261

@@ -314,14 +314,14 @@ T* zone::allocate(Args... args) {
314314
m_finalizer_array.push(&zone::object_destruct<T>, x);
315315
} catch (...) {
316316
undo_allocate(sizeof(T));
317-
throw;
317+
RETHROW;
318318
}
319319
try {
320320
return new (x) T(args...);
321321
} catch (...) {
322322
m_finalizer_array.pop();
323323
undo_allocate(sizeof(T));
324-
throw;
324+
RETHROW;
325325
}
326326
}
327327

0 commit comments

Comments
 (0)