diff options
45 files changed, 150 insertions, 265 deletions
@@ -10,6 +10,8 @@ USER VISIBLE CHANGES BETWEEN ACE-7.0.2 and ACE-7.0.3 . Use more C++11 features +. Various cleanup + USER VISIBLE CHANGES BETWEEN ACE-7.0.1 and ACE-7.0.2 ==================================================== diff --git a/ACE/ace/Bound_Ptr.h b/ACE/ace/Bound_Ptr.h index ab39bc10623..a406cab3ce9 100644 --- a/ACE/ace/Bound_Ptr.h +++ b/ACE/ace/Bound_Ptr.h @@ -121,7 +121,7 @@ public: template <class Y> ACE_Strong_Bound_Ptr (const ACE_Strong_Bound_Ptr<Y, ACE_LOCK> &r) : counter_ (r.counter_), - ptr_ (dynamic_cast<X_t*>(r.ptr_)) + ptr_ (dynamic_cast<X*>(r.ptr_)) { // This ctor is temporarily defined here to increase our chances // of being accepted by broken compilers. @@ -151,7 +151,7 @@ public: // This will work if &r == this, by first increasing the ref count COUNTER *new_counter = r.counter_; - X* new_ptr = dynamic_cast<X_t*> (r.ptr_); + X* new_ptr = dynamic_cast<X*> (r.ptr_); COUNTER::attach_strong (new_counter); if (COUNTER::detach_strong (this->counter_) == 0) delete this->ptr_; @@ -214,8 +214,6 @@ public: ACE_ALLOC_HOOK_DECLARE; private: - typedef X X_t; // This indirection is for Borland C++. - friend class ACE_Weak_Bound_Ptr<X, ACE_LOCK>; template <class Y, class L> @@ -350,8 +348,6 @@ public: ACE_ALLOC_HOOK_DECLARE; private: - typedef X X_t; // This indirection is for Borland C++. - friend class ACE_Strong_Bound_Ptr<X, ACE_LOCK>; /// The ACE_Bound_Ptr_Counter type. diff --git a/ACE/ace/Bound_Ptr.inl b/ACE/ace/Bound_Ptr.inl index 5a7de11982a..17ffe620f71 100644 --- a/ACE/ace/Bound_Ptr.inl +++ b/ACE/ace/Bound_Ptr.inl @@ -173,7 +173,7 @@ ACE_Strong_Bound_Ptr<X, ACE_LOCK>::operator = (const ACE_Strong_Bound_Ptr<X, ACE return; COUNTER *new_counter = rhs.counter_; - X_t *new_ptr = rhs.ptr_; + X *new_ptr = rhs.ptr_; COUNTER::attach_strong (new_counter); if (COUNTER::detach_strong (this->counter_) == 0) delete this->ptr_; @@ -190,7 +190,7 @@ ACE_Strong_Bound_Ptr<X, ACE_LOCK>::operator = (const ACE_Weak_Bound_Ptr<X, ACE_L return; COUNTER *new_counter = rhs.counter_; - X_t *new_ptr = rhs.ptr_; + X *new_ptr = rhs.ptr_; // When creating a strong pointer from a weak one we can't assume that the // underlying object still exists. Therefore we must check for a return value @@ -274,7 +274,7 @@ template<class X, class ACE_LOCK> inline void ACE_Strong_Bound_Ptr<X, ACE_LOCK>::reset (X *p) { COUNTER *old_counter = this->counter_; - X_t *old_ptr = this->ptr_; + X *old_ptr = this->ptr_; this->counter_ = COUNTER::create_strong (); this->ptr_ = p; if (COUNTER::detach_strong (old_counter) == 0) diff --git a/ACE/ace/Compression/rle/RLECompressor.cpp b/ACE/ace/Compression/rle/RLECompressor.cpp index cbed31d58f1..8e83df4dcfc 100644 --- a/ACE/ace/Compression/rle/RLECompressor.cpp +++ b/ACE/ace/Compression/rle/RLECompressor.cpp @@ -1,7 +1,7 @@ #include "RLECompressor.h" #include "ace/OS_NS_string.h" -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750) # pragma option push -w-8072 #endif @@ -140,6 +140,6 @@ ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_RLECompressor, ACE_SYNCH_M // Close versioned namespace, if enabled by the user. ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750) # pragma option pop #endif diff --git a/ACE/ace/Future.h b/ACE/ace/Future.h index 8238511b765..e928370f1e6 100644 --- a/ACE/ace/Future.h +++ b/ACE/ace/Future.h @@ -161,9 +161,6 @@ private: // = Encapsulate reference count and object lifetime of instances. - // These methods must go after the others to work around a bug with - // Borland's C++ Builder... - /// Allocate a new ACE_Future_Rep<T> instance, returning NULL if it /// cannot be created. static ACE_Future_Rep<T> *internal_create (void); diff --git a/ACE/ace/High_Res_Timer.cpp b/ACE/ace/High_Res_Timer.cpp index e849e19a013..ef30f0833fb 100644 --- a/ACE/ace/High_Res_Timer.cpp +++ b/ACE/ace/High_Res_Timer.cpp @@ -374,8 +374,7 @@ ACE_High_Res_Timer::elapsed_time (ACE_hrtime_t &nanoseconds) const // For more background on this, please see bugzilla #1024. nanoseconds = ACE_High_Res_Timer::elapsed_hrtime (this->end_, this->start_) * (1024000u / ACE_High_Res_Timer::global_scale_factor ()); - // Caution - Borland has a problem with >>=, so resist the temptation. - nanoseconds = nanoseconds >> 10; + nanoseconds >>= 10; // Right shift is implemented for non native 64-bit ints // operator/ only for a 32 bit result ! #else @@ -391,15 +390,11 @@ ACE_High_Res_Timer::elapsed_time_incr (ACE_hrtime_t &nanoseconds) const { #if !defined (ACE_WIN32) // Same as above. - nanoseconds = this->total_ - * (1024000u / ACE_High_Res_Timer::global_scale_factor ()); - // Caution - Borland has a problem with >>=, so resist the temptation. - nanoseconds = nanoseconds >> 10; + nanoseconds = this->total_ * (1024000u / ACE_High_Res_Timer::global_scale_factor ()); + nanoseconds >>= 10; #else // This a higher-precision version, specific for Windows systems - nanoseconds = - this->total_ * 1000000000u / - ACE_High_Res_Timer::global_scale_factor (); + nanoseconds = this->total_ * 1000000000u / ACE_High_Res_Timer::global_scale_factor (); #endif } diff --git a/ACE/ace/OS_NS_math.h b/ACE/ace/OS_NS_math.h index 9bbb0dbc369..daf9e9f70c4 100644 --- a/ACE/ace/OS_NS_math.h +++ b/ACE/ace/OS_NS_math.h @@ -22,6 +22,7 @@ # endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/os_include/os_math.h" +#include <cmath> #include /**/ "ace/ACE_export.h" @@ -44,7 +45,7 @@ inline double ace_log2_helper (double x) #undef log2 #else # if !defined (ACE_LACKS_LOG2) - return ACE_STD_NAMESPACE::log2 (x); + return std::log2 (x); # else /* ================================================================== @@ -87,7 +88,7 @@ namespace ACE_OS inline T floor (T x) { - return ACE_STD_NAMESPACE::floor (x); + return std::floor (x); } #if defined (ACE_HAS_WINCE) @@ -96,7 +97,7 @@ namespace ACE_OS inline float floor (float x) { - return ACE_STD_NAMESPACE::floorf (x); + return std::floorf (x); } #endif @@ -105,7 +106,7 @@ namespace ACE_OS inline T ceil (T x) { - return ACE_STD_NAMESPACE::ceil (x); + return std::ceil (x); } #if defined (ACE_HAS_WINCE) @@ -114,7 +115,7 @@ namespace ACE_OS inline float ceil (float x) { - return ACE_STD_NAMESPACE::ceilf (x); + return std::ceilf (x); } #endif diff --git a/ACE/ace/OS_NS_signal.h b/ACE/ace/OS_NS_signal.h index c09ef5e94e1..1fb6ca3b114 100644 --- a/ACE/ace/OS_NS_signal.h +++ b/ACE/ace/OS_NS_signal.h @@ -48,7 +48,7 @@ inline int ace_sigemptyset_helper (sigset_t *s) return sigemptyset (s); # undef sigemptyset # else - return ACE_STD_NAMESPACE::sigemptyset (s); + return ::sigemptyset (s); # endif /* defined (sigemptyset) */ } @@ -58,7 +58,7 @@ inline int ace_sigfillset_helper (sigset_t *s) return sigfillset (s); # undef sigfillset # else - return ACE_STD_NAMESPACE::sigfillset (s); + return ::sigfillset (s); # endif /* defined (sigfillset) */ } @@ -68,7 +68,7 @@ inline int ace_sigaddset_helper (sigset_t *s, int signum) return sigaddset (s, signum); # undef sigaddset # else - return ACE_STD_NAMESPACE::sigaddset (s, signum); + return ::sigaddset (s, signum); # endif /* defined (sigaddset) */ } @@ -78,7 +78,7 @@ inline int ace_sigdelset_helper (sigset_t *s, int signum) return sigdelset (s, signum); # undef sigdelset # else - return ACE_STD_NAMESPACE::sigdelset (s, signum); + return ::sigdelset (s, signum); # endif /* defined (sigdelset) */ } @@ -88,7 +88,7 @@ inline int ace_sigismember_helper (sigset_t *s, int signum) return sigismember (s, signum); # undef sigismember # else - return ACE_STD_NAMESPACE::sigismember (s, signum); + return ::sigismember (s, signum); # endif /* defined (sigismember) */ } #endif /* !defined (ACE_LACKS_SIGSET) */ @@ -100,12 +100,11 @@ inline int ace_sigsuspend_helper (const sigset_t *s) return sigsuspend (s); # undef sigsuspend # else - return ACE_STD_NAMESPACE::sigsuspend (s); + return ::sigsuspend (s); # endif /* defined (sigsuspen) */ } #endif /* ACE_HAS_SIGSUSPEND */ - # if !defined (SIG_BLOCK) # define SIG_BLOCK 1 # endif /* SIG_BLOCK */ diff --git a/ACE/ace/OS_NS_stdio.h b/ACE/ace/OS_NS_stdio.h index 1c4046f73a9..03366458315 100644 --- a/ACE/ace/OS_NS_stdio.h +++ b/ACE/ace/OS_NS_stdio.h @@ -47,23 +47,13 @@ * be usable later as there is no way to save the macro definition * using the pre-processor. */ -inline void ace_clearerr_helper (FILE *stream) -{ -#if defined (clearerr) - clearerr (stream); -#undef clearerr -#else - ACE_STD_NAMESPACE::clearerr (stream); -#endif /* defined (clearerr) */ -} - inline int ace_fgetc_helper (FILE *fp) { #if defined (fgetc) return fgetc (fp); #undef fgetc #else - return ACE_STD_NAMESPACE::fgetc (fp); + return ::fgetc (fp); #endif /* defined (fgetc) */ } @@ -74,7 +64,7 @@ inline int ace_fputc_helper (int ch, FILE *fp) return fputc (ch, fp); #undef fputc #else - return ACE_STD_NAMESPACE::fputc (ch, fp); + return ::fputc (ch, fp); #endif /* defined (fputc) */ } #endif /* !ACE_LACKS_FPUTC */ @@ -86,7 +76,7 @@ inline int ace_getc_helper (FILE *fp) return getc (fp); #undef getc #else - return ACE_STD_NAMESPACE::getc (fp); + return ::getc (fp); #endif /* defined (getc) */ } #elif defined getc @@ -99,7 +89,7 @@ inline int ace_putc_helper (int ch, FILE *fp) return putc (ch, fp); #undef putc #elif !defined (ACE_LACKS_PUTC) - return ACE_STD_NAMESPACE::putc (ch, fp); + return ::putc (ch, fp); #else ACE_UNUSED_ARG (ch); ACE_UNUSED_ARG (fp); @@ -107,18 +97,6 @@ inline int ace_putc_helper (int ch, FILE *fp) #endif /* defined (putc) */ } -#if !defined (ACE_LACKS_UNGETC) -inline int ace_ungetc_helper (int ch, FILE *fp) -{ -#if defined (ungetc) - return ungetc (ch, fp); -#undef ungetc -#else - return ACE_STD_NAMESPACE::ungetc (ch, fp); -#endif /* defined (ungetc) */ -} -#endif /* !ACE_LACKS_UNGETC */ - #if !defined ACE_FILENO_EQUIVALENT inline ACE_HANDLE ace_fileno_helper (FILE *fp) { diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl index 9c448db1562..b97adfdbbc9 100644 --- a/ACE/ace/OS_NS_stdio.inl +++ b/ACE/ace/OS_NS_stdio.inl @@ -343,7 +343,7 @@ ACE_OS::flock_wrlock (ACE_OS::ace_flock_t *lock, ACE_INLINE void ACE_OS::clearerr (FILE* fp) { - ace_clearerr_helper (fp); + std::clearerr (fp); } #if !defined (ACE_LACKS_CUSERID) @@ -492,7 +492,7 @@ ACE_INLINE int ACE_OS::fclose (FILE *fp) { ACE_OS_TRACE ("ACE_OS::fclose"); - return ACE_STD_NAMESPACE::fclose (fp); + return std::fclose (fp); } ACE_INLINE FILE * @@ -541,13 +541,13 @@ ACE_INLINE int ACE_OS::fflush (FILE *fp) { ACE_OS_TRACE ("ACE_OS::fflush"); - return ACE_STD_NAMESPACE::fflush (fp); + return std::fflush (fp); } ACE_INLINE int ACE_OS::fgetc (FILE *fp) { - return ace_fgetc_helper (fp); + return std::fgetc (fp); } ACE_INLINE int @@ -569,7 +569,7 @@ ACE_OS::fgetpos (FILE *fp, fpos_t *pos) ACE_UNUSED_ARG (pos); ACE_NOTSUP_RETURN (-1); #else - return ACE_STD_NAMESPACE::fgetpos (fp, pos); + return std::fgetpos (fp, pos); #endif } @@ -582,14 +582,14 @@ ACE_OS::fgets (char *buf, int size, FILE *fp) int c = EOF; for (int i = 0; i < size - 1 && c != '\n'; ++i) { - c = ACE_STD_NAMESPACE::fgetc (fp); + c = std::fgetc (fp); if (c != EOF) *iter++ = static_cast<char> (c); } *iter = '\0'; return c == EOF ? 0 : buf; #else - return ACE_STD_NAMESPACE::fgets (buf, size, fp); + return std::fgets (buf, size, fp); #endif /* ACE_LACKS_FGETS */ } @@ -598,7 +598,7 @@ ACE_INLINE wchar_t * ACE_OS::fgets (wchar_t *buf, int size, FILE *fp) { ACE_OS_TRACE ("ACE_OS::fgets"); - return ACE_STD_NAMESPACE::fgetws (buf, size, fp); + return std::fgetws (buf, size, fp); } #endif /* ACE_HAS_WCHAR && !ACE_LACKS_FGETWS */ @@ -671,7 +671,7 @@ ACE_OS::ungetc (int c, FILE *fp) ACE_UNUSED_ARG (fp); ACE_NOTSUP_RETURN (-1); #else - return ace_ungetc_helper (c, fp); + return std::ungetc (c, fp); #endif } @@ -695,7 +695,7 @@ ACE_OS::putc (int c, FILE *fp) ACE_UNUSED_ARG (fp); ACE_NOTSUP_RETURN (-1); #else - return ace_putc_helper (c, fp); + return std::putc (c, fp); #endif } @@ -708,7 +708,7 @@ ACE_OS::fputs (const char *s, FILE *stream) ACE_UNUSED_ARG (stream); ACE_NOTSUP_RETURN (-1); #else - return ACE_STD_NAMESPACE::fputs (s, stream); + return std::fputs (s, stream); #endif } @@ -717,7 +717,7 @@ ACE_INLINE int ACE_OS::fputs (const wchar_t *s, FILE *stream) { ACE_OS_TRACE ("ACE_OS::fputs"); - return ACE_STD_NAMESPACE::fputws (s, stream); + return std::fputws (s, stream); } #endif /* ACE_HAS_WCHAR && !ACE_LACKS_FPUTWS */ @@ -725,7 +725,7 @@ ACE_INLINE size_t ACE_OS::fread (void *ptr, size_t size, size_t nelems, FILE *fp) { ACE_OS_TRACE ("ACE_OS::fread"); - return ACE_STD_NAMESPACE::fread (ptr, size, nelems, fp); + return std::fread (ptr, size, nelems, fp); } ACE_INLINE FILE * @@ -740,7 +740,7 @@ ACE_OS::freopen (const ACE_TCHAR *filename, const ACE_TCHAR *mode, FILE* stream) ACE_UNUSED_ARG (stream); ACE_NOTSUP_RETURN (0); #else - return ACE_STD_NAMESPACE::freopen (ACE_TEXT_ALWAYS_CHAR (filename), ACE_TEXT_ALWAYS_CHAR (mode), stream); + return std::freopen (ACE_TEXT_ALWAYS_CHAR (filename), ACE_TEXT_ALWAYS_CHAR (mode), stream); #endif /* ACE_WIN32 && ACE_USES_WCHAR */ } @@ -767,7 +767,7 @@ ACE_OS::fseek (FILE *fp, long offset, int whence) } # endif /* SEEK_SET != FILE_BEGIN || SEEK_CUR != FILE_CURRENT || SEEK_END != FILE_END */ #endif /* ACE_WIN32 */ - return ACE_STD_NAMESPACE::fseek (fp, offset, whence); + return std::fseek (fp, offset, whence); } ACE_INLINE int @@ -785,14 +785,14 @@ ACE_OS::fsetpos (FILE* fp, fpos_t* pos) ACE_INLINE long ACE_OS::ftell (FILE* fp) { - return ACE_STD_NAMESPACE::ftell (fp); + return std::ftell (fp); } ACE_INLINE size_t ACE_OS::fwrite (const void *ptr, size_t size, size_t nitems, FILE *fp) { ACE_OS_TRACE ("ACE_OS::fwrite"); - return ACE_STD_NAMESPACE::fwrite (ptr, size, nitems, fp); + return std::fwrite (ptr, size, nitems, fp); } ACE_INLINE void @@ -830,7 +830,7 @@ ACE_OS::puts (const char *s) ACE_UNUSED_ARG (s); ACE_NOTSUP_RETURN (-1); #else - return ::puts (s); + return std::puts (s); #endif /* ACE_LACKS_PUTS */ } @@ -934,7 +934,7 @@ ACE_OS::rewind (FILE *fp) #else // This isn't perfect since it doesn't reset EOF, but it's probably // the closest we can get on WINCE. - (void) ::fseek (fp, 0L, SEEK_SET); + (void) std::fseek (fp, 0L, SEEK_SET); #endif /* ACE_HAS_WINCE */ } @@ -1034,7 +1034,7 @@ ACE_OS::vprintf (const char *format, va_list argptr) ACE_UNUSED_ARG (argptr); ACE_NOTSUP_RETURN (-1); #else - return ::vprintf (format, argptr); + return std::vprintf (format, argptr); #endif /* ACE_LACKS_VPRINTF */ } @@ -1061,7 +1061,7 @@ ACE_OS::vfprintf (FILE *fp, const char *format, va_list argptr) ACE_UNUSED_ARG (argptr); ACE_NOTSUP_RETURN (-1); #else - return ACE_STD_NAMESPACE::vfprintf (fp, format, argptr); + return std::vfprintf (fp, format, argptr); #endif } @@ -1089,7 +1089,7 @@ ACE_OS::vsprintf (char *buffer, const char *format, va_list argptr) ACE_UNUSED_ARG (argptr); ACE_NOTSUP_RETURN (-1); #else - return ::vsprintf (buffer, format, argptr); + return std::vsprintf (buffer, format, argptr); #endif /* ACE_LACKS_VSPRINTF */ } diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h index ab0f86884b1..3ba96b67427 100644 --- a/ACE/ace/OS_NS_stdlib.h +++ b/ACE/ace/OS_NS_stdlib.h @@ -22,6 +22,7 @@ # endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/os_include/os_stdlib.h" +#include <cstdlib> #include /**/ "ace/ACE_export.h" #include "ace/Basic_Types.h" /* ACE_UINT64 and intptr_t in inl file */ @@ -58,7 +59,7 @@ inline ACE_INT64 ace_strtoll_helper (const char *s, char **ptr, int base) return strtoll (s, ptr, base); # undef strtoll # else - return ACE_STD_NAMESPACE::strtoll (s, ptr, base); + return std::strtoll (s, ptr, base); # endif /* strtoll */ } #endif /* !ACE_LACKS_STRTOLL && !ACE_STRTOLL_EQUIVALENT */ @@ -70,7 +71,7 @@ inline ACE_INT64 ace_strtoull_helper (const char *s, char **ptr, int base) return strtoull (s, ptr, base); # undef strtoull # else - return ACE_STD_NAMESPACE::strtoull (s, ptr, base); + return std::strtoull (s, ptr, base); # endif /* strtoull */ } #endif /* !ACE_LACKS_STRTOULL && !ACE_STRTOULL_EQUIVALENT */ diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl index 61c90985c83..33484924803 100644 --- a/ACE/ace/OS_NS_stdlib.inl +++ b/ACE/ace/OS_NS_stdlib.inl @@ -9,12 +9,6 @@ # include "ace/os_include/os_signal.h" #endif -#if defined (ACE_WCHAR_IN_STD_NAMESPACE) -# define ACE_WCHAR_STD_NAMESPACE std -#else -# define ACE_WCHAR_STD_NAMESPACE ACE_STD_NAMESPACE -#endif /* ACE_WCHAR_IN_STD_NAMESPACE */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Doesn't need a macro since it *never* returns! @@ -501,7 +495,7 @@ ACE_OS::strtod (const char *s, char **endptr) ACE_INLINE double ACE_OS::strtod (const wchar_t *s, wchar_t **endptr) { - return ACE_WCHAR_STD_NAMESPACE::wcstod (s, endptr); + return std::wcstod (s, endptr); } #endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOD */ @@ -522,7 +516,7 @@ ACE_OS::strtol (const wchar_t *s, wchar_t **ptr, int base) #if defined (ACE_LACKS_WCSTOL) return ACE_OS::wcstol_emulation (s, ptr, base); #else - return ACE_WCHAR_STD_NAMESPACE::wcstol (s, ptr, base); + return std::wcstol (s, ptr, base); #endif /* ACE_LACKS_WCSTOL */ } #endif /* ACE_HAS_WCHAR */ @@ -544,7 +538,7 @@ ACE_OS::strtoul (const wchar_t *s, wchar_t **ptr, int base) #if defined (ACE_LACKS_WCSTOUL) return ACE_OS::wcstoul_emulation (s, ptr, base); #else - return ACE_WCHAR_STD_NAMESPACE::wcstoul (s, ptr, base); + return std::wcstoul (s, ptr, base); #endif /* ACE_LACKS_WCSTOUL */ } #endif /* ACE_HAS_WCHAR */ @@ -570,7 +564,7 @@ ACE_OS::strtoll (const wchar_t *s, wchar_t **ptr, int base) #elif defined (ACE_WCSTOLL_EQUIVALENT) return ACE_WCSTOLL_EQUIVALENT (s, ptr, base); #else - return ACE_WCHAR_STD_NAMESPACE::wcstoll (s, ptr, base); + return std::wcstoll (s, ptr, base); #endif /* ACE_LACKS_WCSTOLL */ } #endif /* ACE_HAS_WCHAR */ @@ -596,7 +590,7 @@ ACE_OS::strtoull (const wchar_t *s, wchar_t **ptr, int base) #elif defined (ACE_WCSTOULL_EQUIVALENT) return ACE_WCSTOULL_EQUIVALENT (s, ptr, base); #else - return ACE_WCHAR_STD_NAMESPACE::wcstoull (s, ptr, base); + return std::wcstoull (s, ptr, base); #endif /* ACE_LACKS_WCSTOULL */ } #endif /* ACE_HAS_WCHAR */ diff --git a/ACE/ace/OS_NS_string.cpp b/ACE/ace/OS_NS_string.cpp index ff5c4e1e549..cbeda603bbf 100644 --- a/ACE/ace/OS_NS_string.cpp +++ b/ACE/ace/OS_NS_string.cpp @@ -148,7 +148,7 @@ ACE_OS::strsignal (int signum) ret_val = 0; else # endif /* (ACE_NEEDS_STRSIGNAL_RANGE_CHECK */ - ret_val = ACE_STD_NAMESPACE::strsignal (signum); + ret_val = ::strsignal (signum); if (ret_val <= reinterpret_cast<char *> (0)) { diff --git a/ACE/ace/OS_NS_sys_stat.h b/ACE/ace/OS_NS_sys_stat.h index c8b7bb290f6..4fdc51b2898 100644 --- a/ACE/ace/OS_NS_sys_stat.h +++ b/ACE/ace/OS_NS_sys_stat.h @@ -39,11 +39,7 @@ typedef struct stati64 ACE_stat; # define ACE_STAT_FUNC_NAME ::_stati64 # define ACE_WSTAT_FUNC_NAME ::_wstati64 # elif !defined (ACE_HAS_WINCE) && defined (_MSC_VER) -# if defined (ACE_MSVC_USES_DOUBLE_UNDERSCORE_STAT64) -typedef struct __stat64 ACE_stat; -# else typedef struct _stat64 ACE_stat; -# endif # define ACE_STAT_FUNC_NAME ::_stat64 # define ACE_WSTAT_FUNC_NAME ::_wstat64 # elif defined (__MINGW32__) diff --git a/ACE/ace/OS_NS_sys_time.inl b/ACE/ace/OS_NS_sys_time.inl index 5692bf0d8df..ba9ec109a7b 100644 --- a/ACE/ace/OS_NS_sys_time.inl +++ b/ACE/ace/OS_NS_sys_time.inl @@ -47,8 +47,8 @@ ACE_OS::gettimeofday () tv.tv_usec = tb.tb_low / 1000L; #else # if defined (ACE_HAS_TIMEZONE_GETTIMEOFDAY) || \ - defined(ACE_HAS_VOIDPTR_GETTIMEOFDAY) || \ - (defined (ACE_HAS_SVR4_GETTIMEOFDAY) && !defined (SCO)) + defined (ACE_HAS_VOIDPTR_GETTIMEOFDAY) || \ + defined (ACE_HAS_SVR4_GETTIMEOFDAY) ACE_OSCALL (::gettimeofday (&tv, 0), int, result); # elif defined (ACE_VXWORKS) // Assumes that struct timespec is same size as struct timeval, diff --git a/ACE/ace/OS_NS_time.cpp b/ACE/ace/OS_NS_time.cpp index 09a223b8574..81b634f9899 100644 --- a/ACE/ace/OS_NS_time.cpp +++ b/ACE/ace/OS_NS_time.cpp @@ -315,7 +315,7 @@ ACE_OS::mktime (struct tm *t) ACE_OS_GUARD # endif /* ACE_HAS_THREADS && ! ACE_HAS_MT_SAFE_MKTIME */ - return ACE_STD_NAMESPACE::mktime (t); + return std::mktime (t); # endif /* ACE_HAS_WINCE */ } diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl index c5f676ae800..03bb984d762 100644 --- a/ACE/ace/OS_NS_time.inl +++ b/ACE/ace/OS_NS_time.inl @@ -4,6 +4,7 @@ #include "ace/Time_Value.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_time.h" +#include <ctime> ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -15,7 +16,7 @@ ACE_OS::asctime (const struct tm *t) ACE_UNUSED_ARG (t); ACE_NOTSUP_RETURN (0); #else - return ACE_STD_NAMESPACE::asctime (t); + return std::asctime (t); #endif /* ACE_LACKS_ASCTIME */ } @@ -48,7 +49,7 @@ ACE_OS::asctime_r (const struct tm *t, char *buf, int buflen) ACE_NOTSUP_RETURN (0); #else char *result = 0; - ACE_OSCALL (ACE_STD_NAMESPACE::asctime (t), char *, result); + ACE_OSCALL (std::asctime (t), char *, result); ACE_OS::strsncpy (buf, result, buflen); return buf; #endif /* ACE_HAS_REENTRANT_FUNCTIONS */ @@ -421,7 +422,7 @@ ACE_OS::strftime (char *s, size_t maxsize, const char *format, ACE_UNUSED_ARG (timeptr); ACE_NOTSUP_RETURN (0); #else - return ACE_STD_NAMESPACE::strftime (s, maxsize, format, timeptr); + return std::strftime (s, maxsize, format, timeptr); #endif /* ACE_LACKS_STRFTIME */ } @@ -432,7 +433,7 @@ ACE_OS::strptime (const char *buf, const char *format, struct tm *tm) #if defined (ACE_LACKS_STRPTIME) return ACE_OS::strptime_emulation (buf, format, tm); #else - return ACE_STD_NAMESPACE::strptime (buf, format, tm); + return ::strptime (buf, format, tm); #endif /* ACE_LACKS_STRPTIME */ } diff --git a/ACE/ace/OS_NS_wchar.inl b/ACE/ace/OS_NS_wchar.inl index 3feee38ec13..29f5b70f1b3 100644 --- a/ACE/ace/OS_NS_wchar.inl +++ b/ACE/ace/OS_NS_wchar.inl @@ -9,7 +9,7 @@ ACE_OS::fgetwc (FILE* fp) ACE_UNUSED_ARG (fp); ACE_NOTSUP_RETURN (0); # else - return ACE_STD_NAMESPACE::fgetwc (fp); + return std::fgetwc (fp); # endif /* ACE_LACKS_FGETWC */ } #endif /* ACE_HAS_WCHAR */ @@ -76,7 +76,7 @@ ACE_OS::ungetwc (wint_t c, FILE* fp) ACE_UNUSED_ARG (fp); ACE_NOTSUP_RETURN (0); # else - return ACE_STD_NAMESPACE::ungetwc (c, fp); + return std::ungetwc (c, fp); # endif /* ACE_LACKS_FGETWC */ } #endif /* ACE_HAS_WCHAR */ diff --git a/ACE/ace/README b/ACE/ace/README index d327f232334..e0cf882a00b 100644 --- a/ACE/ace/README +++ b/ACE/ace/README @@ -214,8 +214,7 @@ ACE_HAS_AUTOMATIC_INIT_FINI Compiler/platform correctly calls init()/fini() for shared libraries ACE_HAS_BIG_FD_SET Compiler/platform has typedef - u_long fdmask (e.g., Linux and - SCO). + u_long fdmask (e.g., Linux). ACE_HAS_BROKEN_ACCEPT_ADDR Platform can't correctly deal with a NULL addr to accept() (e.g, VxWorks < 6.9). @@ -365,8 +364,7 @@ ACE_HAS_NONCONST_GETBY Platform uses non-const char * in calls to gethostbyaddr, gethostbyname, getservbyname ACE_HAS_NONCONST_MSGSND Platform has a non-const - parameter to msgsend() (e.g., - SCO). + parameter to msgsend(). ACE_HAS_NONCONST_READV Platform omits const qualifier from iovec parameter in readv() prototype. ACE_HAS_NONCONST_SELECT_TIMEVAL Platform's select() uses @@ -801,7 +799,7 @@ ACE_LACKS_MKFIFO Platform lacks mkfifo() e.g., ACE_LACKS_MKTEMP Platform lacks the mktemp() function. ACE_LACKS_MKSTEMP Platform lacks the mkstemp() function. ACE_LACKS_MMAP The platform doesn't have - mmap(2) (e.g., SCO UNIX). + mmap(2). ACE_LACKS_MODE_MASKS Platform/compiler doesn't have open() mode masks. ACE_LACKS_MPROTECT The platform doesn't have @@ -862,8 +860,7 @@ ACE_LACKS_READV Platform doesn't define readv, ACE_LACKS_RENAME Platform lacks rename(). ACE_LACKS_RLIMIT Platform/compiler lacks {get,set}rlimit() function - (e.g., VxWorks, and - SCO UNIX) + (e.g., VxWorks) ACE_LACKS_RLIMIT_PROTOTYPE Platform/compiler lacks {get,set}rlimit() prototypes (e.g., Tandem) @@ -925,8 +922,7 @@ ACE_LACKS_SYSV_SHMEM Platform lacks System V shared ACE_LACKS_SIGINFO_H Platform lacks the siginfo.h include file (e.g., MVS) ACE_LACKS_SOCKETPAIR Platform lacks the - socketpair() call (e.g., SCO - UNIX) + socketpair() cal ACE_LACKS_STRCASECMP Compiler/platform lacks strcasecmp() (e.g., DG/UX, UNIXWARE, VXWORKS) diff --git a/ACE/ace/Refcounted_Auto_Ptr.h b/ACE/ace/Refcounted_Auto_Ptr.h index 1bb10b6585b..2129741655f 100644 --- a/ACE/ace/Refcounted_Auto_Ptr.h +++ b/ACE/ace/Refcounted_Auto_Ptr.h @@ -146,8 +146,6 @@ private: ACE_ALLOC_HOOK_DECLARE; // = Encapsulate reference count and object lifetime of instances. - // These methods must go after the others to work around a bug with - // Borland's C++ Builder... /// Allocate a new ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK> instance, /// returning NULL if it cannot be created. diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp index eb01d7c0cf7..5180362bea6 100644 --- a/ACE/ace/SOCK_Dgram.cpp +++ b/ACE/ace/SOCK_Dgram.cpp @@ -406,7 +406,6 @@ ACE_SOCK_Dgram::recv (iovec iov[], // Send an iovec of size N to ADDR as a datagram (connectionless // version). - ssize_t ACE_SOCK_Dgram::send (const iovec iov[], int n, @@ -420,8 +419,8 @@ ACE_SOCK_Dgram::send (const iovec iov[], // Determine the total length of all the buffers in <iov>. for (i = 0; i < n; i++) -#if ! (defined(__BORLANDC__) || defined(ACE_LINUX) || defined(ACE_HAS_RTEMS)) - // The iov_len is unsigned on Linux, RTEMS and with Borland. If we go +#if ! (defined(ACE_LACKS_IOVEC) || defined(ACE_LINUX) || defined(ACE_HAS_RTEMS)) + // The iov_len is unsigned on Linux, RTEMS and when using the ACE iovec struct. If we go // ahead and try the if, it will emit a warning. if (iov[i].iov_len < 0) return -1; @@ -481,8 +480,8 @@ ACE_SOCK_Dgram::recv (iovec iov[], ACE_UNUSED_ARG (to_addr); for (i = 0; i < n; i++) -#if ! (defined(__BORLANDC__) || defined(ACE_LINUX) || defined(ACE_HAS_RTEMS)) - // The iov_len is unsigned on Linux, RTEMS and with Borland. If we go +#if ! (defined(ACE_LACKS_IOVEC) || defined(ACE_LINUX) || defined(ACE_HAS_RTEMS)) + // The iov_len is unsigned on Linux, RTEMS and when using the ACE iovec struct. If we go // ahead and try the if, it will emit a warning. if (iov[i].iov_len < 0) return -1; diff --git a/ACE/ace/XML_Utils/XercesString.h b/ACE/ace/XML_Utils/XercesString.h index 661f4bd056a..1915832d503 100644 --- a/ACE/ace/XML_Utils/XercesString.h +++ b/ACE/ace/XML_Utils/XercesString.h @@ -64,7 +64,6 @@ namespace XML private: XMLCh* _wstr; // Internal representation - }; XML_Utils_Export bool operator== (const XStr& lhs, const XStr& rhs); @@ -72,7 +71,6 @@ namespace XML XML_Utils_Export std::ostream& operator<< (std::ostream& o, XStr const& str); - } #include /**/ "ace/post.h" diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index 5b302b80607..08e748d9276 100644 --- a/ACE/ace/config-macros.h +++ b/ACE/ace/config-macros.h @@ -253,9 +253,9 @@ // ============================================================================ #if !defined (ACE_UNUSED_ARG) -# if defined (__GNUC__) || (defined (__BORLANDC__) && defined (__clang__)) +# if defined (__GNUC__) || defined (__BORLANDC__) # define ACE_UNUSED_ARG(a) (void) (a) -# elif defined (ghs) || defined (__hpux) || defined (__DECCXX) || defined (__rational__) || defined (__USLC__) || defined (ACE_RM544) || defined (__DCC__) || defined (__PGI) +# elif defined (ghs) || defined (__hpux) || defined (__DECCXX) || defined (__rational__) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) // Some compilers complain about "statement with no effect" with (a). // This eliminates the warnings, and no code is generated for the null // conditional statement. @note that may only be true if -O is enabled, @@ -266,7 +266,7 @@ # endif /* ghs ..... */ #endif /* !ACE_UNUSED_ARG */ -#if defined (_MSC_VER) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (ACE_RM544) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || (defined (__HP_aCC) && (__HP_aCC < 39000 || __HP_aCC >= 60500)) || defined (__IAR_SYSTEMS_ICC__) +#if defined (_MSC_VER) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || (defined (__HP_aCC) && (__HP_aCC < 39000 || __HP_aCC >= 60500)) || defined (__IAR_SYSTEMS_ICC__) # define ACE_NOTREACHED(a) #else /* ghs || ..... */ # define ACE_NOTREACHED(a) a diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index c15a8669558..3e13ecba237 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -131,10 +131,8 @@ #if (__BORLANDC__ <= 0x750) # define ACE_LACKS_ISWCTYPE # define ACE_LACKS_ISCTYPE -#endif - -#if (__BORLANDC__ >= 0x640) && (__BORLANDC__ <= 0x750) # define ACE_LACKS_STRTOK_R +# define ACE_LACKS_ASCTIME_R #endif #if (__BORLANDC__ <= 0x740) @@ -142,10 +140,6 @@ # define ACE_LACKS_GMTIME_R #endif -#if (__BORLANDC__ <= 0x750) -# define ACE_LACKS_ASCTIME_R -#endif - #define ACE_WCSDUP_EQUIVALENT ::_wcsdup #define ACE_STRCASECMP_EQUIVALENT ::stricmp #define ACE_STRNCASECMP_EQUIVALENT ::strnicmp @@ -160,36 +154,29 @@ #endif #if defined (ACE_HAS_BCC32) -// The bcc32 compiler can't handle assembly in inline methods or -// templates (E2211). When we build for pentium optimized and we are inlining -// then we disable inline assembly -# if defined (ACE_HAS_PENTIUM) && defined(__ACE_INLINE__) && !defined(__clang__) -# define ACE_LACKS_INLINE_ASSEMBLY -# endif # define ACE_SIZEOF_LONG_DOUBLE 10 # define ACE_NEEDS_DL_UNDERSCORE #endif -#ifdef __clang__ -# define ACE_ANY_OPS_USE_NAMESPACE -# define ACE_HAS_BUILTIN_BSWAP16 -# define ACE_HAS_BUILTIN_BSWAP32 -# define ACE_HAS_BUILTIN_BSWAP64 -# define ACE_LACKS_INLINE_ASSEMBLY +#define ACE_ANY_OPS_USE_NAMESPACE +#define ACE_HAS_BUILTIN_BSWAP16 +#define ACE_HAS_BUILTIN_BSWAP32 +#define ACE_HAS_BUILTIN_BSWAP64 +#define ACE_LACKS_INLINE_ASSEMBLY +#define ACE_LACKS_PID_T -# if __cplusplus >= 201103L -# define ACE_HAS_CPP11 -# endif -# if __cplusplus >= 201402L -# define ACE_HAS_CPP14 -# endif -# if __cplusplus >= 201703L -# define ACE_HAS_CPP17 -# endif -# if __cplusplus >= 202002L -# define ACE_HAS_CPP20 -# endif -#endif /* __clang__ */ +#if __cplusplus >= 201103L +# define ACE_HAS_CPP11 +#endif +#if __cplusplus >= 201402L +# define ACE_HAS_CPP14 +#endif +#if __cplusplus >= 201703L +# define ACE_HAS_CPP17 +#endif +#if __cplusplus >= 202002L +# define ACE_HAS_CPP20 +#endif #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_BORLAND_H */ diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index 7a4ac9282b9..a22eb51989a 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -304,17 +304,6 @@ #define ACE_LACKS_IOVEC #define ACE_LACKS_LOG2 #define ACE_LACKS_CADDR_T -#if !defined(__MINGW32__) && !defined (__BORLANDC__) -# define ACE_LACKS_MODE_T -#endif -#if !defined(__MINGW32__) -# define ACE_LACKS_PID_T -#endif -#if !defined (__BORLANDC__) -# define ACE_LACKS_NLINK_T -# define ACE_LACKS_UID_T -# define ACE_LACKS_GID_T -#endif #define ACE_LACKS_SETENV #define ACE_LACKS_UNSETENV diff --git a/ACE/ace/config-win32-mingw.h b/ACE/ace/config-win32-mingw.h index 61f4b833632..767feb993fc 100644 --- a/ACE/ace/config-win32-mingw.h +++ b/ACE/ace/config-win32-mingw.h @@ -85,6 +85,9 @@ #define ACE_HAS_WINSOCK2_GQOS #define ACE_ISCTYPE_EQUIVALENT ::_isctype #define ACE_LACKS_SET_ABORT_BEHAVIOR +#define ACE_LACKS_NLINK_T +#define ACE_LACKS_UID_T +#define ACE_LACKS_GID_T // We trust the user: He must have used -mpentiumpro or -mpentium // if that is what he wants. diff --git a/ACE/ace/config-win32-mingw64.h b/ACE/ace/config-win32-mingw64.h index 1f3231b0e56..f7414ebda54 100644 --- a/ACE/ace/config-win32-mingw64.h +++ b/ACE/ace/config-win32-mingw64.h @@ -115,6 +115,9 @@ #define ACE_HAS_NONCONST_WCSDUP #define ACE_ISCTYPE_EQUIVALENT ::_isctype #define ACE_LACKS_SET_ABORT_BEHAVIOR +#define ACE_LACKS_NLINK_T +#define ACE_LACKS_UID_T +#define ACE_LACKS_GID_T #define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE diff --git a/ACE/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h index 44e670fc9d4..866c45f6dd2 100644 --- a/ACE/ace/config-win32-msvc-14.h +++ b/ACE/ace/config-win32-msvc-14.h @@ -141,5 +141,12 @@ #define ACE_LACKS_CLOSEDIR #define ACE_LACKS_READDIR +#define ACE_LACKS_MODE_T +#define ACE_LACKS_PID_T + +#define ACE_LACKS_NLINK_T +#define ACE_LACKS_UID_T +#define ACE_LACKS_GID_T + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_MSVC_14_H */ diff --git a/ACE/ace/post.h b/ACE/ace/post.h index 67049ff8354..03741323f39 100644 --- a/ACE/ace/post.h +++ b/ACE/ace/post.h @@ -15,7 +15,7 @@ # pragma pack (pop) #elif defined (__BORLANDC__) # pragma option pop -# if (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +# if (__BORLANDC__ <= 0x750) # pragma option pop # endif # pragma nopushoptwarn diff --git a/ACE/ace/pre.h b/ACE/ace/pre.h index 0b5f37caa16..1c2004c7784 100644 --- a/ACE/ace/pre.h +++ b/ACE/ace/pre.h @@ -17,7 +17,7 @@ # pragma pack (push, 8) #elif defined (__BORLANDC__) # pragma option push -a8 -b -Ve- -Vx- -w-rvl -w-rch -w-ccc -w-obs -w-aus -w-pia -w-inl -w-sig -# if (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +# if (__BORLANDC__ <= 0x750) // False warning: Function defined with different linkage, reported to // Embarcadero as QC 117740 # pragma option push -w-8127 diff --git a/ACE/tests/Bug_2980_Regression_Test.cpp b/ACE/tests/Bug_2980_Regression_Test.cpp index 1b4383d61ce..002cf03b53c 100644 --- a/ACE/tests/Bug_2980_Regression_Test.cpp +++ b/ACE/tests/Bug_2980_Regression_Test.cpp @@ -4,7 +4,7 @@ #include <iostream> #include <assert.h> -#include <stdio.h> +#include <cstdio> #include <string.h> #include <stdlib.h> #include <string.h> @@ -14,7 +14,6 @@ // platform-specific ones. // // This test has not been made to work on Windows and vxWorks, yet ... - #if defined (ACE_HAS_THREADS) # define CAN_USE_THREADS #else @@ -43,16 +42,8 @@ namespace { # undef CAN_RUN_TEST #endif -#if defined (__BORLANDC__) -# define PRINTF std::printf -#else -# define PRINTF printf -#endif - - using voidfunction = int (*)(); - #if defined (CAN_RUN_TEST) static void * dllHandle; static voidfunction capi_init = 0; @@ -60,13 +51,11 @@ static voidfunction capi_fini = 0; static voidfunction capi_dosomething = 0; #endif /* defined (CAN_RUN_TEST) */ - extern "C" void* loadDll(void*) { #if defined (CAN_RUN_TEST) - - PRINTF ("loadDll - entered\n"); + std::printf ("loadDll - entered\n"); const char *subdir_env = getenv ("ACE_EXE_SUB_DIR"); if (subdir_env) { @@ -85,7 +74,7 @@ void* loadDll(void*) if (dllHandle == 0) { - PRINTF ("unable to load library: %s\n", dlerror()); + std::printf ("unable to load library: %s\n", dlerror()); assert(dllHandle != 0); } @@ -93,7 +82,7 @@ void* loadDll(void*) memcpy (&capi_init, &temp, sizeof (temp)); if (capi_init == 0) { - PRINTF ("unable to resolve symbol capi_init: %s\n", dlerror()); + std::printf ("unable to resolve symbol capi_init: %s\n", dlerror()); assert(capi_init != 0); } @@ -101,7 +90,7 @@ void* loadDll(void*) memcpy (&capi_fini, &temp, sizeof (temp)); if (capi_fini == 0) { - PRINTF ("unable to resolve symbol capi_fini: %s\n", dlerror()); + std::printf ("unable to resolve symbol capi_fini: %s\n", dlerror()); assert(capi_fini != 0); } @@ -109,11 +98,11 @@ void* loadDll(void*) memcpy (&capi_dosomething, &temp, sizeof (temp)); if (capi_dosomething == 0) { - PRINTF ("unable to resolve symbol capi_dosomething: %s\n", dlerror()); + std::printf ("unable to resolve symbol capi_dosomething: %s\n", dlerror()); assert(capi_dosomething != 0); } capi_init(); - PRINTF ("loadDll - leaving\n"); + std::printf ("loadDll - leaving\n"); #endif /* defined (CAN_RUN_TEST) */ return 0; } @@ -122,10 +111,10 @@ extern "C" void* unloadDll(void*) { #if defined (CAN_RUN_TEST) - PRINTF ("unloadDll - entered\n"); + std::printf ("unloadDll - entered\n"); capi_fini(); dlclose(dllHandle); - PRINTF ("unloadDll - leaving\n"); + std::printf ("unloadDll - leaving\n"); #endif /* defined (CAN_RUN_TEST) */ return 0; } @@ -148,12 +137,12 @@ int main (int, char *[]) { #if !defined (CAN_RUN_TEST) # ifndef ACE_FACE_SAFETY_EXTENDED - PRINTF ("Terminating because this test has not been designed " + std::printf ("Terminating because this test has not been designed " "to run on WIN32 or VXWORKS.\n"); # endif #else - PRINTF ("main called\n"); - PRINTF ("main - calling loadDll\n"); + std::printf ("main called\n"); + std::printf ("main - calling loadDll\n"); # if defined (CAN_USE_THREADS) int result = 0; @@ -161,44 +150,43 @@ int main (int, char *[]) result = pthread_create(&tid1, 0, &loadDll, 0); if (result != 0) { - PRINTF ("pthread_create() failed: %d\n", result); + std::printf ("pthread_create() failed: %d\n", result); return result; } pthread_join(tid1, 0); - PRINTF ("loadDll thread finished and re-joined\n"); + std::printf ("loadDll thread finished and re-joined\n"); # else loadDll(0); - PRINTF ("loadDll finished\n"); + std::printf ("loadDll finished\n"); # endif /* defined (CAN_USE_THREADS) */ - PRINTF ("main - calling unloadDll\n"); + std::printf ("main - calling unloadDll\n"); # if defined (CAN_USE_THREADS) pthread_t tid2; result = pthread_create(&tid2, 0, &unloadDll, 0); if (result != 0) { - PRINTF ("pthread_create() failed: %d\n", result); + std::printf ("pthread_create() failed: %d\n", result); return 1; } pthread_join(tid2, 0); - PRINTF ("unloadDll thread finished and re-joined\n"); + std::printf ("unloadDll thread finished and re-joined\n"); # else unloadDll(0); - PRINTF ("unloadDll finished\n"); + std::printf ("unloadDll finished\n"); # endif /* defined (CAN_USE_THREADS) */ - PRINTF ("main finished\n"); + std::printf ("main finished\n"); #endif /* defined (CAN_RUN_TEST) */ return 0; - } - //FUZZ: enable check_for_lack_ACE_OS +//FUZZ: enable check_for_lack_ACE_OS diff --git a/ACE/tests/Compiler_Features_24_Test.cpp b/ACE/tests/Compiler_Features_24_Test.cpp index 895a28820ea..003b70fd525 100644 --- a/ACE/tests/Compiler_Features_24_Test.cpp +++ b/ACE/tests/Compiler_Features_24_Test.cpp @@ -71,14 +71,6 @@ run_main (int, ACE_TCHAR *[]) FOO::o_r<FOO::A> l = FOO::create(); -#if defined __clang__ && \ - (defined __apple_build_version__ && __apple_build_version__ < 9100000 \ - || __clang_major__ < 5) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: This version of clang doesn't") - ACE_TEXT (" compile the C++11 code in this test.\n"))); - ACE_END_TEST; - return 1; -#else FOO::o_r<FOO::A> l2 = FOO::make_f<FOO::A>(); // next line doesn't compile and shouldn't //FOO::o_r<FOO::B> l3 = FOO::make_f<FOO::B>(); @@ -88,5 +80,4 @@ run_main (int, ACE_TCHAR *[]) ACE_END_TEST; return 0; -#endif } diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp index 752b1a21d6d..7b8a9e79076 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp @@ -188,9 +188,7 @@ RTCP_Channel_In::update_seq(ACE_UINT16 seq) else if (udelta <= RTP_SEQ_MOD - MAX_MISORDER) { // the sequence number made a large jump - ACE_UINT32 temp = seq; // Borland reports a warning on the next line - // without this line. - if (temp == this->bad_seq_) + if (seq == this->bad_seq_) { // two sequential packets, assume the other side restarted without // telling us so just re-sync diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp index 94fa8838943..9423eef309a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp @@ -136,10 +136,8 @@ RTCP_BYE_Packet::RTCP_BYE_Packet(char* buffer, int *len) } // Optional - store the reason for leaving - unsigned int temp = this->chd_.length_; // Borland reports a warning on the - // following line with out this. ACE_OS::memset(this->reason_, 0, sizeof(this->reason_)); - if (temp > this->chd_.count_) + if (this->chd_.length_ > this->chd_.count_) { this->reason_length_ = buffer[index]; index++; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp index c5c6d1097c4..c088f39ac8b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp @@ -340,23 +340,6 @@ TAO_Port_Utils<T>::create_entry (const char *id, return T::_narrow (obj.in ()); } -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) -// Borland gives warnings about argument not used on the construct as used -// for the other compilers. This has been reported to Borland, adding -// a workaround to suppress these warnings so that the real important ones -// are not missed. -template<typename T> -void -TAO_Port_Utils<T>::set_is_multiple (CORBA::Boolean is_multiple, - ACE_Configuration * config, - ACE_Configuration_Section_Key &key) -{ - ACE_UNUSED_ARG (is_multiple); - ACE_UNUSED_ARG (config); - ACE_UNUSED_ARG (key); - // Do nothing for everything except UsesDef. -} -#else template<typename T> void TAO_Port_Utils<T>::set_is_multiple (CORBA::Boolean /* is_multiple */, @@ -365,7 +348,6 @@ TAO_Port_Utils<T>::set_is_multiple (CORBA::Boolean /* is_multiple */, { // Do nothing for everything except UsesDef. } -#endif TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h index f27157372ac..8554ce38f27 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h @@ -21,7 +21,7 @@ #if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750) # pragma option push -w-8022 #endif @@ -66,7 +66,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750) # pragma option pop #endif diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h index 8e47d1fb080..997bba215eb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h @@ -18,7 +18,7 @@ #include "orbsvcs/Notify/Default_Factory.h" -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750) # pragma option push -w-8022 #endif @@ -48,7 +48,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750) # pragma option pop #endif diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp index 7c80f15b44c..311b9a2eb75 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp @@ -10,7 +10,7 @@ #include "DllOrb.h" -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750) # pragma option push -w-8057 #endif @@ -231,6 +231,6 @@ ACE_TMAIN(int, ACE_TCHAR **argv) return 0; } -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750) # pragma option pop #endif diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp index aad60460f99..218dae68668 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp @@ -62,7 +62,7 @@ namespace TAO { CORBA::TypeCode_var xtc = this->exception_list_->item (l); this->ex_data_[l].id = xtc->id (); - this->ex_data_[l].alloc = 0; + this->ex_data_[l].alloc = nullptr; #if TAO_HAS_INTERCEPTORS == 1 this->ex_data_[l].tc_ptr = xtc.in (); #endif diff --git a/TAO/tests/Bug_3574_Regression/test.cpp b/TAO/tests/Bug_3574_Regression/test.cpp index acbbf98b012..fe300ac0ac0 100644 --- a/TAO/tests/Bug_3574_Regression/test.cpp +++ b/TAO/tests/Bug_3574_Regression/test.cpp @@ -1,6 +1,6 @@ #include "tao/StringSeqC.h" -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750) # pragma option push -w-8011 #endif @@ -52,6 +52,6 @@ ACE_TMAIN (int, ACE_TCHAR *[]) return 0; } -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750) # pragma option pop #endif diff --git a/TAO/tests/Bug_3940_Regression/README b/TAO/tests/Bug_3940_Regression/README index 0f8198c1b8f..8802dc32f18 100644 --- a/TAO/tests/Bug_3940_Regression/README +++ b/TAO/tests/Bug_3940_Regression/README @@ -1,5 +1,3 @@ - - This is a compile only test. If it compiles, it's passed. tao_idl choked on the annotation syntax of IDL4 (and DDS-XTypes) @@ -12,5 +10,4 @@ because that syntax was unknown to its IDL grammar: The first patch for this bug adds a rule in the lexer to ignore the annotations by consuming them without action. -Actual processing of annotations is still to be done. - +Actual processing of annotations still has to be done. diff --git a/TAO/tests/Bug_3940_Regression/test.idl b/TAO/tests/Bug_3940_Regression/test.idl index 904c8910ddc..eda6931bf4b 100644 --- a/TAO/tests/Bug_3940_Regression/test.idl +++ b/TAO/tests/Bug_3940_Regression/test.idl @@ -1,5 +1,3 @@ -#if !defined (__BORLANDC__) - @annotation unit { string value; }; @@ -35,5 +33,3 @@ module test { }; }; - -#endif diff --git a/TAO/tests/RTCORBA/README b/TAO/tests/RTCORBA/README index dc496d58cab..f809b74a71e 100644 --- a/TAO/tests/RTCORBA/README +++ b/TAO/tests/RTCORBA/README @@ -1,5 +1,3 @@ - - This directory houses a collection of tests which exercise TAO support for features defined in the RT-CORBA specification. Tests which exercise TAO-specific RT features can be found in $TAO_ROOT/performance-tests/RTCorba. diff --git a/TAO/utils/nslist/nslist.cpp b/TAO/utils/nslist/nslist.cpp index 5bb63b0ab79..b3670dc4291 100644 --- a/TAO/utils/nslist/nslist.cpp +++ b/TAO/utils/nslist/nslist.cpp @@ -64,8 +64,7 @@ namespace static void remove () { - const NestedNamingContexts *const pThisOne= pBottom; - delete pThisOne; // i.e. delete pBottom; Attempt to stop over-optimisation by BORLAND + delete pBottom; } static size_t hasBeenSeen (const CosNaming::NamingContext_ptr nc) diff --git a/TAO/utils/wxNamingViewer/wxNamingViewer.cpp b/TAO/utils/wxNamingViewer/wxNamingViewer.cpp index c8f8ab64bb7..c53dc78a671 100644 --- a/TAO/utils/wxNamingViewer/wxNamingViewer.cpp +++ b/TAO/utils/wxNamingViewer/wxNamingViewer.cpp @@ -39,7 +39,6 @@ public: virtual int OnExit(); }; - IMPLEMENT_APP(WxNamingViewer) // Need this to keep C++Builder 4 happy @@ -47,7 +46,6 @@ IMPLEMENT_APP(WxNamingViewer) extern WINAPI WinMain( HINSTANCE, HINSTANCE, LPSTR, int); #endif - int WxNamingViewer::OnExit() { ACE::fini(); |