blob: cabde7ddc88c236918b2b3b24d1f9a9f28a775f8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
From 9e36399573fd075d9607b3a89c4358dc18b065d7 Mon Sep 17 00:00:00 2001
From: Andrew Davis <afd@ti.com>
Date: Mon, 13 Feb 2023 13:11:16 -0600
Subject: [PATCH] include/loki/SmallObj.h: ISO C++17 does not allow dynamic
exception specifications
Upstream-Status: Pending
Signed-off-by: Andrew Davis <afd@ti.com>
---
include/loki/SmallObj.h | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/include/loki/SmallObj.h b/include/loki/SmallObj.h
index 65828bf..b5d1857 100644
--- a/include/loki/SmallObj.h
+++ b/include/loki/SmallObj.h
@@ -455,12 +455,7 @@ namespace Loki
public:
/// Throwing single-object new throws bad_alloc when allocation fails.
-#ifdef _MSC_VER
- /// @note MSVC complains about non-empty exception specification lists.
- static void * operator new ( std::size_t size )
-#else
- static void * operator new ( std::size_t size ) throw ( std::bad_alloc )
-#endif
+ static void * operator new ( std::size_t size ) throw ()
{
typename MyThreadingModel::Lock lock;
(void)lock; // get rid of warning
@@ -508,13 +503,7 @@ namespace Loki
#ifdef LOKI_SMALL_OBJECT_USE_NEW_ARRAY
/// Throwing array-object new throws bad_alloc when allocation fails.
-#ifdef _MSC_VER
- /// @note MSVC complains about non-empty exception specification lists.
- static void * operator new [] ( std::size_t size )
-#else
- static void * operator new [] ( std::size_t size )
- throw ( std::bad_alloc )
-#endif
+ static void * operator new [] ( std::size_t size ) throw ()
{
typename MyThreadingModel::Lock lock;
(void)lock; // get rid of warning
|
