diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-01-15 12:28:28 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-01-15 12:28:28 +0100 |
| commit | b5aeaf20ef9d15d09acb52b4c8ac77762937ae26 (patch) | |
| tree | 00741a7bb87658c8addd13408e65aa3ce37594a2 | |
| parent | f865e5929c4668611213fc1ee677ef47ad0f6482 (diff) | |
| download | ATCD-b5aeaf20ef9d15d09acb52b4c8ac77762937ae26.tar.gz | |
More cleanup
* ACE/ace/config-linux-common.h:
* ACE/ace/config-macros.h:
* TAO/TAO_IDL/fe/idl.yy.cpp:
| -rw-r--r-- | ACE/ace/config-linux-common.h | 2 | ||||
| -rw-r--r-- | ACE/ace/config-macros.h | 4 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/idl.yy.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h index 1d3eba2f27e..2e22623bd76 100644 --- a/ACE/ace/config-linux-common.h +++ b/ACE/ace/config-linux-common.h @@ -71,7 +71,7 @@ * (TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.{h,c}) that may indirectly * include this */ -#else /* ! __GNUG__ && !__DECCXX && !__INTEL_COMPILER && && !__PGI */ +#else /* ! __GNUG__ && !__INTEL_COMPILER && && !__PGI */ # ifdef __cplusplus /* Let it slide for C compilers. */ # error unsupported compiler in ace/config-linux.h # endif /* __cplusplus */ diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index fcb4520300d..bb67f3df98d 100644 --- a/ACE/ace/config-macros.h +++ b/ACE/ace/config-macros.h @@ -254,7 +254,7 @@ #if !defined (ACE_UNUSED_ARG) # if defined (__GNUC__) || defined (__BORLANDC__) # define ACE_UNUSED_ARG(a) (void) (a) -# elif defined (ghs) || defined (__DECCXX) || defined (__rational__) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) +# elif defined (ghs) || defined (__rational__) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) // Some compilers complain about "statement with no effect" with (a). // This eliminates the warnings, and no code is generated for the null // conditional statement. @note that may only be true if -O is enabled, @@ -265,7 +265,7 @@ # endif /* ghs ..... */ #endif /* !ACE_UNUSED_ARG */ -#if defined (_MSC_VER) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || (defined (__HP_aCC) && (__HP_aCC < 39000 || __HP_aCC >= 60500)) || defined (__IAR_SYSTEMS_ICC__) +#if defined (_MSC_VER) || defined (ghs) || defined(__BORLANDC__) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || defined (__IAR_SYSTEMS_ICC__) # define ACE_NOTREACHED(a) #else /* ghs || ..... */ # define ACE_NOTREACHED(a) a diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp index fc9ef4403bb..e5546389c91 100644 --- a/TAO/TAO_IDL/fe/idl.yy.cpp +++ b/TAO/TAO_IDL/fe/idl.yy.cpp @@ -288,7 +288,7 @@ /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L || defined (__HP_aCC) +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, * if you want the limit (max/min) macros for int types. |