Author: sebor Date: Wed Dec 19 15:52:20 2007 New Revision: 605745 URL: http://svn.apache.org/viewvc?rev=605745&view=rev Log: 2007-12-19 Travis Vitek <[EMAIL PROTECTED]>
Merged rev 605744 with a tweak for STDCXX-240 from trunk. * include/rw/_config-xlc.h [__IBMCPP__]: Conditionally disable exception support if command line option is set and the compiler is version 7.0 or later. Modified: incubator/stdcxx/branches/4.2.x/include/rw/_config-xlc.h Modified: incubator/stdcxx/branches/4.2.x/include/rw/_config-xlc.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/rw/_config-xlc.h?rev=605745&r1=605744&r2=605745&view=diff ============================================================================== --- incubator/stdcxx/branches/4.2.x/include/rw/_config-xlc.h (original) +++ incubator/stdcxx/branches/4.2.x/include/rw/_config-xlc.h Wed Dec 19 15:52:20 2007 @@ -138,7 +138,7 @@ # define _RWSTD_NO_UNDEFINED_TEMPLATES #endif // __TEMPINC__ -#ifndef __EXCEPTIONS +#if (__IBMCPP__ >= 700) && !defined(__EXCEPTIONS) // disable exceptions when the macro __EXCEPTIONS // is not #defined by the compiler, e.g., when // the -qnoeh option is used