diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-07-16 22:05:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-16 22:05:26 +0200 |
| commit | a874267e5b6bdbb0438ed19ca46d6b2a90c31097 (patch) | |
| tree | 6e4264629617f99f2ad042ce9d1fa3f1ccc5aba4 /ACE | |
| parent | 51349e55c430dd2b5d7cee2ad421dd5b912d1ff3 (diff) | |
| parent | a210795f448aabc6e3bfb4ca2913164b21d2d2be (diff) | |
| download | ATCD-a874267e5b6bdbb0438ed19ca46d6b2a90c31097.tar.gz | |
Merge pull request #1613 from jwillemsen/jwi-ACE_RM544
Removed ACE_RM544 check, not set in any config file
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ace/config-macros.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index fee1a38b1df..08e748d9276 100644 --- a/ACE/ace/config-macros.h +++ b/ACE/ace/config-macros.h @@ -255,7 +255,7 @@ #if !defined (ACE_UNUSED_ARG) # if defined (__GNUC__) || defined (__BORLANDC__) # define ACE_UNUSED_ARG(a) (void) (a) -# elif defined (ghs) || defined (__hpux) || defined (__DECCXX) || defined (__rational__) || defined (__USLC__) || defined (ACE_RM544) || defined (__DCC__) || defined (__PGI) +# elif defined (ghs) || defined (__hpux) || defined (__DECCXX) || 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, @@ -266,7 +266,7 @@ # endif /* ghs ..... */ #endif /* !ACE_UNUSED_ARG */ -#if defined (_MSC_VER) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (ACE_RM544) || 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 (__DECCXX) || defined(__BORLANDC__) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || (defined (__HP_aCC) && (__HP_aCC < 39000 || __HP_aCC >= 60500)) || defined (__IAR_SYSTEMS_ICC__) # define ACE_NOTREACHED(a) #else /* ghs || ..... */ # define ACE_NOTREACHED(a) a |