Author: sebor
Date: Fri Jun 1 17:41:42 2007
New Revision: 543678
URL: http://svn.apache.org/viewvc?view=rev&rev=543678
Log:
2007-06-01 Martin Sebor <[EMAIL PROTECTED]>
STDCXX-432
* _config.h (_config-eccp.h): Avoided #including when using HP aCC.
* exception.cpp (stdarg.h): Used _RWSTD_EDG_ECCP to guard against
inclusion when using EDG eccp based compilers including HP aCC 6.
Modified:
incubator/stdcxx/trunk/include/rw/_config.h
incubator/stdcxx/trunk/src/exception.cpp
Modified: incubator/stdcxx/trunk/include/rw/_config.h
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/rw/_config.h?view=diff&rev=543678&r1=543677&r2=543678
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_config.h (original)
+++ incubator/stdcxx/trunk/include/rw/_config.h Fri Jun 1 17:41:42 2007
@@ -164,8 +164,12 @@
#if defined (__EDG__) \
&& !defined (__DECCXX) \
+ && !defined (__HP_aCC) \
&& !defined (__INTEL_COMPILER) \
&& !defined (_SGI_COMPILER_VERSION)
+ // FIXME: make this more robust by detecting the EDG eccp demo
+ // during library configuration (and avoid relying on compiler
+ // specific macros)
# include "_config-eccp.h"
#endif // __EDG__
Modified: incubator/stdcxx/trunk/src/exception.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/exception.cpp?view=diff&rev=543678&r1=543677&r2=543678
==============================================================================
--- incubator/stdcxx/trunk/src/exception.cpp (original)
+++ incubator/stdcxx/trunk/src/exception.cpp Fri Jun 1 17:41:42 2007
@@ -1,4 +1,4 @@
- /***************************************************************************
+/***************************************************************************
*
* exception.cpp - Source for the Standard Library exception classes
*
@@ -40,14 +40,15 @@
#include <rw/_defs.h>
-#if !defined (__EDG__) || defined (__DECCXX) || defined (__INTEL_COMPILER)
+#ifndef _RWSTD_EDG_ECCP
# include <stdarg.h>
#else
+ // use "special" magic for the EDG eccp demo
# include <ansi/_cstdarg.h>
_USING (_STD::va_list);
-#endif // __EDG__ ...
+#endif // EDG eccp demo
#include <stdlib.h>
#include <stdio.h>
