diff options
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/config-macros.h | 17 | ||||
| -rw-r--r-- | ACE/ace/streams.h | 3 |
3 files changed, 8 insertions, 18 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index d270385865d..d910604978c 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Mon Jul 28 13:39:13 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-macros.h: + * ace/streams.h: + Removed workarounds for ancient Borland C++ versions + Mon Jul 28 13:32:13 2008 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Asynch_Acceptor.cpp: diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index 377ba7215a4..b3ce32c8c23 100644 --- a/ACE/ace/config-macros.h +++ b/ACE/ace/config-macros.h @@ -449,32 +449,19 @@ while (0) #if defined (ACE_WIN32) -# if defined (__BORLANDC__) && (__BORLANDC__ <= 0x550) -# define ACE_WIN32CALL_RETURN(X,TYPE,FAILVALUE) \ - do { \ - TYPE ace_result_; \ - TYPE ace_local_result_ = (TYPE) X; \ - ace_result_ = ace_local_result_; \ - if (ace_result_ == FAILVALUE) \ - ACE_OS::set_errno_to_last_error (); \ - return ace_result_; \ - } while (0) -# else -# define ACE_WIN32CALL_RETURN(X,TYPE,FAILVALUE) \ +# define ACE_WIN32CALL_RETURN(X,TYPE,FAILVALUE) \ do { \ TYPE ace_result_ = (TYPE) X; \ if (ace_result_ == FAILVALUE) \ ACE_OS::set_errno_to_last_error (); \ return ace_result_; \ } while (0) -# endif /* defined (__BORLANDC__) && (__BORLANDC__ <= 0x550) */ -# define ACE_WIN32CALL(X,TYPE,FAILVALUE,RESULT) \ +# define ACE_WIN32CALL(X,TYPE,FAILVALUE,RESULT) \ do { \ RESULT = (TYPE) X; \ if (RESULT == FAILVALUE) \ ACE_OS::set_errno_to_last_error (); \ } while (0) - #endif /* ACE_WIN32 */ // The C99 security-improved run-time returns an error value on failure; diff --git a/ACE/ace/streams.h b/ACE/ace/streams.h index d26ceb73dd7..d84e3d1340f 100644 --- a/ACE/ace/streams.h +++ b/ACE/ace/streams.h @@ -55,9 +55,6 @@ // when it is used. # include /**/ <iomanip.h> # else -# if defined (__BORLANDC__) && (__BORLANDC__ == 0x551) -# include /**/ <iterator> -# endif /* __BORLANDC__ && __BORLANDC__ == 0x551 */ # include /**/ <iostream> # include /**/ <fstream> # include /**/ <istream> |