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

[Martin Konrad]

No impact on users. Let's merge this into 7.0 only (see https://code.launchpad.net/~info-martin-konrad/epics-base/+git/epics-base/+merge/375451/comments/983673).

[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

[Andrew Johnson (anj)]

The diff shown by this MR includes some additional commits that were made to 3.15 but haven't yet been merged up to 7.0, and it also doesn't reflect the fact that the libCom files have moved in the 7.0 branch. As I said before I agree with the aim, but this branch doesn't currently contain what you're actually wanting it to do.

You should be able to force-push the correct commit to the same branch on LP and the site will recalculate the MR diff automatically.

review: Needs Fixing

[Martin Konrad (info-martin-konrad)]

Oops, sorry, seems like I had pushed to the wrong remote... The good news is that Launchpad finally seems to update the preview diff in the MP correctly after force pushing :-)

[Andrew Johnson (anj)]

Looks fine to me now, thanks.

review: Approve

[mdavidsaver (mdavidsaver)]

Cherry-picked as 13234afc405e15fde56e4ca3840f87f350aea75d

review: Approve

diff --git a/modules/libcom/src/osi/compiler/gcc/compilerSpecific.h b/modules/libcom/src/osi/compiler/gcc/compilerSpecific.h
index 13d9119..e140d8b 100644
--- a/modules/libcom/src/osi/compiler/gcc/compilerSpecific.h
+++ b/modules/libcom/src/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))
 
 /* Expands to a 'const char*' which describes the name of the current function scope */
 #define EPICS_FUNCTION __PRETTY_FUNCTION__
@@ -46,14 +42,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 */
 
@@ -63,11 +53,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/modules/libcom/src/osi/compiler/msvc/compilerSpecific.h b/modules/libcom/src/osi/compiler/msvc/compilerSpecific.h
index 75bfa83..4e282db 100644
--- a/modules/libcom/src/osi/compiler/msvc/compilerSpecific.h
+++ b/modules/libcom/src/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
 
 /* Expands to a 'const char*' which describes the name of the current function scope */
 #define EPICS_FUNCTION __FUNCTION__
@@ -42,13 +38,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 */