Merge ~info-martin-konrad/epics-base:simplify-compiler-specific-macros into ~epics-core/epics-base/+git/epics-base:3.15

[Martin Konrad]

No impact on users. Let's merge this into 3.15 and 7.0.

[mdavidsaver (mdavidsaver)]

Fine by me. Though this will (further) remove support for gcc 2. Also Visual Studio .NET 2002 (7.0).

review: Approve

[Andrew Johnson (anj)]

Doing this on 3.15 is going to be a problem, both https://epics.anl.gov/base/R3-15/index.php and https://jenkins.aps.anl.gov/job/epics-base-3.15-vx55/ show that we still support VxWorks 5.5 on the 3.15 branch, and that comes with gcc-2.96+. Sorry.

Doing it on 7.0 would be fine by me though.

review: Disapprove

Unmerged commits

be65dc3... by Martin Konrad on 2019-11-12

Simplify definition of compiler-specific macros

Remove conditionals for older compiler versions that aren't
supported by EPICS Base anymore.

diff --git a/src/libCom/osi/compiler/gcc/compilerSpecific.h b/src/libCom/osi/compiler/gcc/compilerSpecific.h
index ca46a93..e37f0fc 100644
--- a/src/libCom/osi/compiler/gcc/compilerSpecific.h
+++ b/src/libCom/osi/compiler/gcc/compilerSpecific.h
@@ -24,11 +24,7 @@
 #   error compiler/gcc/compilerSpecific.h is not for use with the clang compiler
 #endif
 
-#if __GNUC__ > 2
-#  define EPICS_ALWAYS_INLINE __inline__ __attribute__((always_inline))
-#else
-#  define EPICS_ALWAYS_INLINE __inline__
-#endif
+#define EPICS_ALWAYS_INLINE __inline__ __attribute__((always_inline))
  
 #ifdef __cplusplus
 
@@ -43,14 +39,8 @@
  * CXX_PLACEMENT_DELETE - defined if compiler supports placement delete
  * CXX_THROW_SPECIFICATION - defined if compiler supports throw specification
  */
-
-#if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 95 )
-#   define CXX_THROW_SPECIFICATION
-#endif
-
-#if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 96 )
-#   define CXX_PLACEMENT_DELETE
-#endif
+#define CXX_THROW_SPECIFICATION
+#define CXX_PLACEMENT_DELETE
 
 #endif /* __cplusplus */
 
@@ -60,11 +50,9 @@
 #define EPICS_PRINTF_STYLE(f,a) __attribute__((format(__printf__,f,a)))
 
 /*
- * Deprecation marker if possible
+ * Deprecation marker
  */
-#if  (__GNUC__ > 2)
-#   define EPICS_DEPRECATED __attribute__((deprecated))
-#endif
+#define EPICS_DEPRECATED __attribute__((deprecated))
 
 /*
  * Unused marker
diff --git a/src/libCom/osi/compiler/msvc/compilerSpecific.h b/src/libCom/osi/compiler/msvc/compilerSpecific.h
index 49cf266..630ef97 100644
--- a/src/libCom/osi/compiler/msvc/compilerSpecific.h
+++ b/src/libCom/osi/compiler/msvc/compilerSpecific.h
@@ -20,11 +20,7 @@
 #   error compiler/msvc/compilerSpecific.h is only for use with the Microsoft compiler
 #endif
 
-#if _MSC_VER >= 1200
 #define EPICS_ALWAYS_INLINE __forceinline
-#else
-#define EPICS_ALWAYS_INLINE __inline
-#endif
 
 #ifdef __cplusplus
 
@@ -39,13 +35,8 @@
  * CXX_PLACEMENT_DELETE - defined if compiler supports placement delete
  * CXX_THROW_SPECIFICATION - defined if compiler supports throw specification
  */
-#if _MSC_VER >= 1200  /* visual studio 6.0 or later */
-#    define CXX_PLACEMENT_DELETE
-#endif
-
-#if _MSC_VER > 1300  /* some release after visual studio 7 we hope */
-#    define CXX_THROW_SPECIFICATION
-#endif
+#define CXX_PLACEMENT_DELETE
+#define CXX_THROW_SPECIFICATION
 
 #endif /* __cplusplus */