Experimental Physics and
Industrial Control System

Martin Konrad has proposed merging ~info-martin-konrad/epics-base:simplify-compiler-specific-macros into epics-base:3.15.

Requested reviews:
  EPICS Core Developers (epics-core)

For more details, see:
https://code.launchpad.net/~info-martin-konrad/epics-base/+git/epics-base/+merge/375451

No impact on users. Let's merge this into 3.15 and 7.0.
-- 
Your team EPICS Core Developers is requested to review the proposed merge of ~info-martin-konrad/epics-base:simplify-compiler-specific-macros into epics-base:3.15.

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 */
 

Replies:

Re: [Merge] ~info-martin-konrad/epics-base:simplify-compiler-specific-macros into epics-base:3.15 mdavidsaver via Core-talk

Re: [Merge] ~info-martin-konrad/epics-base:simplify-compiler-specific-macros into epics-base:3.15 Andrew Johnson via Core-talk

[Merge] ~info-martin-konrad/epics-base:simplify-compiler-specific-macros into epics-base:3.15 Martin Konrad via Core-talk

Navigate by Date:

Prev: [Merge] ~info-martin-konrad/epics-base:retire-epicsexcept into epics-base:3.15 Martin Konrad via Core-talk

Next: Re: Base 3.14.12.5 make uninstall not removing bin or lib Johnson, Andrew N. via Core-talk

Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  <2019>  2020  2021  2022  2023  2024 

Navigate by Thread:

Prev: [Merge] ~info-martin-konrad/epics-base:retire-epicsexcept into epics-base:3.15 noreply--- via Core-talk

Next: Re: [Merge] ~info-martin-konrad/epics-base:simplify-compiler-specific-macros into epics-base:3.15 mdavidsaver via Core-talk

Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  <2019>  2020  2021  2022  2023  2024