summaryrefslogtreecommitdiff
path: root/sci-libs/libdap/files/libdap-3.18.1-fix-c++14.patch
blob: 6b74fa10a2405e741fecba681414b275626c27ff (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
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
C++11 changed destructor semantics to be noexcept(true)
by default, leading to potentially changed semantics.

--- a/HTTPResponse.h
+++ b/HTTPResponse.h
@@ -115,6 +115,9 @@
     temp_file and headers are deleted. If the tmp file name is "", it is
     not deleted. */
     virtual ~HTTPResponse()
+#if __cplusplus >= 201103L
+    noexcept(false)
+#endif
     {
         DBG(cerr << "Freeing HTTPConnect resources (" + d_file + ")... ");
 
--- a/MarshallerThread.cc
+++ b/MarshallerThread.cc
@@ -106,6 +106,9 @@
  * Unlock the mutex
  */
 Locker::~Locker()
+#if __cplusplus >= 201103L
+    noexcept(false)
+#endif
 {
     DBG(cerr << "Unlocking the mutex! (" << pthread_self() << ")" << endl);
 
@@ -140,6 +143,9 @@
 }
 
 ChildLocker::~ChildLocker()
+#if __cplusplus >= 201103L
+    noexcept(false)
+#endif
 {
     DBG(cerr << "Unlocking the mutex! (" << pthread_self() << ")" << endl);
 
@@ -164,6 +170,9 @@
 }
 
 MarshallerThread::~MarshallerThread()
+#if __cplusplus >= 201103L
+    noexcept(false)
+#endif
 {
     int status = pthread_mutex_lock(&d_out_mutex);
     if (status != 0) throw InternalErr(__FILE__, __LINE__, "Could not lock m_mutex");
--- a/MarshallerThread.h
+++ b/MarshallerThread.h
@@ -52,7 +52,11 @@
 class Locker {
 public:
     Locker(pthread_mutex_t &lock, pthread_cond_t &cond, int &count);
-    virtual ~Locker();
+    virtual ~Locker()
+#if __cplusplus >= 201103L
+    noexcept(false)
+#endif
+    ;
 
 private:
     pthread_mutex_t& m_mutex;
@@ -74,7 +78,11 @@
 class ChildLocker {
 public:
     ChildLocker(pthread_mutex_t &lock, pthread_cond_t &cond, int &count);
-    virtual ~ChildLocker();
+    virtual ~ChildLocker()
+#if __cplusplus >= 201103L
+    noexcept(false)
+#endif
+    ;
 
 private:
     pthread_mutex_t& m_mutex;
@@ -144,7 +152,11 @@
 
 public:
     MarshallerThread();
-    virtual ~MarshallerThread();
+    virtual ~MarshallerThread()
+#if __cplusplus >= 201103L
+    noexcept(false)
+#endif
+    ;
 
     pthread_mutex_t &get_mutex() { return d_out_mutex; }
     pthread_cond_t &get_cond() { return d_out_cond; }
--- a/Response.h
+++ b/Response.h
@@ -93,6 +93,9 @@
 
     /** Close the stream. */
     virtual ~Response()
+#if __cplusplus >= 201103L
+    noexcept(false)
+#endif
     {
         if (d_stream)
             fclose(d_stream);