EPICS Base

Merge ~info-martin-konrad/epics-base:remove-epicsthrows into ~epics-core/epics-base/+git/epics-base:7.0

  1. Git
  2. lp:~info-martin-konrad/epics-base
  3. remove-epicsthrows
  4. Merge into 7.0
Proposed by Martin Konrad
Status: Merged
Merge reported by: mdavidsaver
Merged at revision: 3e3c0f5257252e24bee9baf3eb358bf52f4c152f
Proposed branch: ~info-martin-konrad/epics-base:remove-epicsthrows
Merge into: ~epics-core/epics-base/+git/epics-base:7.0
Diff against target: 56 lines (+0/-19)
3 files modified
modules/libcom/src/osi/compiler/clang/compilerSpecific.h (+0/-2)
modules/libcom/src/osi/compiler/gcc/compilerSpecific.h (+0/-5)
modules/libcom/src/osi/compilerDependencies.h (+0/-12)
Reviewer Review Type Date Requested Status
mdavidsaver Approve
Review via email: mp+375445@code.launchpad.net

Description of the change

Potential impact on users, let's merge this into 7.0.

To post a comment you must log in.
Revision history for this message
mdavidsaver (mdavidsaver) wrote :

Fine by me. throw() has never been useful.

review: Approve
Revision history for this message
mdavidsaver (mdavidsaver) wrote :

Cherry-picked as 218459f454b263f02518ed22f8375cc040c9116d

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/modules/libcom/src/osi/compiler/clang/compilerSpecific.h b/modules/libcom/src/osi/compiler/clang/compilerSpecific.h
2index 2053227..0498f6e 100644
3--- a/modules/libcom/src/osi/compiler/clang/compilerSpecific.h
4+++ b/modules/libcom/src/osi/compiler/clang/compilerSpecific.h
5@@ -33,10 +33,8 @@
6
7 /*
8 * CXX_PLACEMENT_DELETE - defined if compiler supports placement delete
9- * CXX_THROW_SPECIFICATION - defined if compiler supports throw specification
10 */
11 #define CXX_PLACEMENT_DELETE
12-#define CXX_THROW_SPECIFICATION
13
14 #endif /* __cplusplus */
15
16diff --git a/modules/libcom/src/osi/compiler/gcc/compilerSpecific.h b/modules/libcom/src/osi/compiler/gcc/compilerSpecific.h
17index 13d9119..f053495 100644
18--- a/modules/libcom/src/osi/compiler/gcc/compilerSpecific.h
19+++ b/modules/libcom/src/osi/compiler/gcc/compilerSpecific.h
20@@ -44,13 +44,8 @@
21
22 /*
23 * CXX_PLACEMENT_DELETE - defined if compiler supports placement delete
24- * CXX_THROW_SPECIFICATION - defined if compiler supports throw specification
25 */
26
27-#if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 95 )
28-# define CXX_THROW_SPECIFICATION
29-#endif
30-
31 #if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 96 )
32 # define CXX_PLACEMENT_DELETE
33 #endif
34diff --git a/modules/libcom/src/osi/compilerDependencies.h b/modules/libcom/src/osi/compilerDependencies.h
35index 3bd835c..0b333d7 100644
36--- a/modules/libcom/src/osi/compilerDependencies.h
37+++ b/modules/libcom/src/osi/compilerDependencies.h
38@@ -21,18 +21,6 @@
39 #ifdef __cplusplus
40
41 /*
42- * usage: void func () epicsThrows (( std::bad_alloc, std::logic_error ))
43- *
44- * Note: now a widely accepted concensus (ref Meyers and C++ faq) is that
45- * one should avoid using throw specifications in C++ code
46- */
47-#if defined ( CXX_THROW_SPECIFICATION )
48-# define epicsThrows(X) throw X
49-#else
50-# define epicsThrows(X)
51-#endif
52-
53-/*
54 * usage: epicsPlacementDeleteOperator (( void *, myMemoryManager & ))
55 */
56 #if defined ( CXX_PLACEMENT_DELETE )

Subscribers

People subscribed via source and target branches