diff options
-rw-r--r-- | ACE/ChangeLog | 14 | ||||
-rw-r--r-- | ACE/ace/config-macros.h | 8 |
2 files changed, 17 insertions, 5 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 0cce2f8d5d9..f17effd5df3 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,8 +1,20 @@ +Thu May 31 03:16:53 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com> + + * ace/config-macros.h: + + Reverted changes from: + Wed May 30 00:17:35 UTC 2007 Abdullah Sowayan <abdul...@lmco.com> + It introduced around 10 new warnings for ACE/TAO/CIAO under GCC + Compilers. We'll try to address/fix those after the beta is out. + + ACE_NOTREACHED macro now expands to nothing for Visual Studio + Compilers. + Thu May 31 03:12:50 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com> * bin/fuzz.pl: - Tabs shouldn't be used as per ACE/TAO/CIAO coding guidlines. + Tabs shouldn't be used as per ACE/TAO/CIAO coding guidlines. Extended fuzz to detect tabs in the source code. Wed May 30 00:17:35 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com> diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index 0d5ce52b591..5e7e5536b69 100644 --- a/ACE/ace/config-macros.h +++ b/ACE/ace/config-macros.h @@ -403,11 +403,11 @@ # define ACE_UNUSED_ARG(a) (a) #endif /* ghs || __GNUC__ || ..... */ -//#if defined (__sgi) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (ACE_RM544) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM) || (defined (__HP_aCC) && (__HP_aCC >= 60500)) +#if defined (_MSC_VER) || defined(__sgi) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (ACE_RM544) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM) || (defined (__HP_aCC) && (__HP_aCC >= 60500)) # define ACE_NOTREACHED(a) -//#else /* __sgi || ghs || ..... */ -//# define ACE_NOTREACHED(a) a -//#endif /* __sgi || ghs || ..... */ +#else /* __sgi || ghs || ..... */ +# define ACE_NOTREACHED(a) a +#endif /* __sgi || ghs || ..... */ // ============================================================================ // ACE_ALLOC_HOOK* macros |