diff options
| -rw-r--r-- | ACE/ace/OS_NS_signal.h | 13 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_string.cpp | 2 | ||||
| -rw-r--r-- | ACE/ace/Refcounted_Auto_Ptr.h | 2 | ||||
| -rw-r--r-- | ACE/ace/XML_Utils/XercesString.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp | 4 | ||||
| -rw-r--r-- | TAO/utils/nslist/nslist.cpp | 3 | ||||
| -rw-r--r-- | TAO/utils/wxNamingViewer/wxNamingViewer.cpp | 2 |
8 files changed, 10 insertions, 22 deletions
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_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/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/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/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/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(); |