diff options
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/configure.ac | 16 | ||||
| -rw-r--r-- | ACE/m4/config_h.m4 | 3 |
3 files changed, 9 insertions, 19 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 8bbaf72f52a..e3b84264bd0 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,12 @@ +Tue Jun 10 23:45:34 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com> + + * configure.ac: + * m4/config_h.m4: + + Remove feature test and autoheader template for + ACE_HAS_BROKEN_CONDITIONAL_STRING_CAST. This feature test macro + is no longer used in ACE. + Tue Jun 10 23:43:19 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com> * configure.ac: diff --git a/ACE/configure.ac b/ACE/configure.ac index 792ec7a13b5..4265e1cf8eb 100644 --- a/ACE/configure.ac +++ b/ACE/configure.ac @@ -2415,22 +2415,6 @@ foo *f = new (x) foo; ],,[AC_DEFINE([ACE_LACKS_PLACEMENT_OPERATOR_DELETE])]) -dnl Check if const char * can be rvalue in conditional operator -ACE_CACHE_CHECK([if const char * can be rvalue in conditional operator], - [ace_cv_feature_conditional_str_cast], - [ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[ - const char * foo = 0; - const char * bar = 0; - - const char * ace = ((1 < 2) ? foo : bar); - ]])],[ - ace_cv_feature_conditional_str_cast=yes - ],[ - ace_cv_feature_conditional_str_cast=no - ]) - ],,[AC_DEFINE([ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS])]) - dnl Check if templates require source on platform dnl dnl FIXME: This test may be broken. diff --git a/ACE/m4/config_h.m4 b/ACE/m4/config_h.m4 index 752e93fd5a1..084a747f48c 100644 --- a/ACE/m4/config_h.m4 +++ b/ACE/m4/config_h.m4 @@ -272,9 +272,6 @@ AH_TEMPLATE([ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS], AH_TEMPLATE([ACE_HAS_BROKEN_MAP_FAILED], [Platform doesn't cast MAP_FAILED to a (void *).]) -AH_TEMPLATE([ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS], -[Compiler can't handle const char * as rvalue in conditional operator.]) - AH_TEMPLATE([ACE_HAS_BROKEN_CTIME], [Compiler/platform uses macro for ctime (e.g., MVS)]) |