diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | ace/OS_Memory.h | 9 | ||||
| -rw-r--r-- | m4/compiler.m4 | 3 |
4 files changed, 22 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 31ad48af6e4..0ac1871807d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Fri Mar 11 18:15:18 2005 Steve Huston <shuston@riverace.com> + + * m4/compiler.m4: Remove the hard-coded addition of -library=iostream. + This uses old iostreams. Not sure why this was here, since the + regular GNU build doesn't turn it on. + + * ace/OS_Memory.h: For Sun CC, add settings needed for proper + definition of ACE_nothrow. Thanks to Mark Wilson + <mwil at lle dot rochester dot edu> for reporting this. + + * THANKS: Added Mark Wilson to the Hall of Fame. + Fri Mar 11 18:05:29 2005 Steve Huston <shuston@riverace.com> * ace/OS_NS_arpa_inet.cpp (inet_aton): Windows Server 2003 changed @@ -1962,6 +1962,7 @@ Ming Xiong <xiongm at isis dot vanderbilt dot edu> James Hill <jhill at isis dot vanderbilt dot edu> Stoyan Paunov <spaunov at isis dot vanderbilt dot edu> Sean Parker <supinlick at yahoo dot com> +Mark Wilson <mwil at lle dot rochester dot edu> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ace/OS_Memory.h b/ace/OS_Memory.h index 89616c74d81..f11aca10679 100644 --- a/ace/OS_Memory.h +++ b/ace/OS_Memory.h @@ -126,6 +126,15 @@ typedef void *ACE_MALLOC_T; # else # include /**/ <new> # define ACE_bad_alloc std::bad_alloc +# if defined (ACE_HAS_NEW_NOTHROW) +# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) +# define ACE_nothrow std::nothrow +# define ACE_nothrow_t std::nothrow_t +# else +# define ACE_nothrow nothrow +# define ACE_nothrow_t nothrow_t +# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ +# endif /* ACE_HAS_NEW_NOTHROW */ # define ACE_throw_bad_alloc throw ACE_bad_alloc () # endif /* __SUNPRO_CC < 0x500 */ # elif defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) diff --git a/m4/compiler.m4 b/m4/compiler.m4 index 721af9ac6cf..56d6171fb96 100644 --- a/m4/compiler.m4 +++ b/m4/compiler.m4 @@ -332,9 +332,6 @@ dnl AC_BEFORE([$0], [AC_PROG_LIBTOOL]) fi CXXFLAGS="$CXXFLAGS -instances=explicit" - else - CXXFLAGS="$CXXFLAGS -library=iostream" - AC_DEFINE([ACE_USES_OLD_IOSTREAMS]) fi CXXFLAGS="$CXXFLAGS" |