From 6cea6b378b8133eb980785eedc3735a6d9ff5eab Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 28 Sep 2006 13:50:17 +0000 Subject: Thu Sep 28 13:35:04 UTC 2006 Johnny Willemsen --- ACE/ChangeLog | 13 +++++++++++++ ACE/ace/CDR_Stream.cpp | 2 +- ACE/ace/TP_Reactor.h | 8 ++++---- ACE/ace/TP_Reactor.inl | 10 +++++----- ACE/ace/config-hpux-11.00.h | 3 --- 5 files changed, 23 insertions(+), 13 deletions(-) diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 969a6a1059d..dbbf106b6fd 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,16 @@ +Thu Sep 28 13:35:04 UTC 2006 Johnny Willemsen + + * ace/config-hpux-11.00.h: + Removed ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION that + was set for gcc, with this define set the ACE library doesn't + build. + + * ace/CDR_Stream.cpp: + Initialise pointer with 0 + + * ace/TP_Reactor.{h,inl}: + Changed owner from int to bool. + Wed Sep 27 21:18:04 UTC 2006 Steve Huston * ace/Synch_Options.h: Corrected the table of possible Use_Reactor, diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp index e5636990a7e..2a6807df320 100644 --- a/ACE/ace/CDR_Stream.cpp +++ b/ACE/ace/CDR_Stream.cpp @@ -1350,7 +1350,7 @@ ACE_InputCDR::read_1 (ACE_CDR::Octet *x) ACE_CDR::Boolean ACE_InputCDR::read_2 (ACE_CDR::UShort *x) { - char *buf; + char *buf = 0; if (this->adjust (ACE_CDR::SHORT_SIZE, buf) == 0) { #if !defined (ACE_DISABLE_SWAP_ON_READ) diff --git a/ACE/ace/TP_Reactor.h b/ACE/ace/TP_Reactor.h index 228247cb2e8..d90474252c5 100644 --- a/ACE/ace/TP_Reactor.h +++ b/ACE/ace/TP_Reactor.h @@ -101,7 +101,7 @@ public: /// Returns whether the thread that created this object ownes the /// token or not. - int is_owner (void); + bool is_owner (void); /// A helper method that grabs the token for us, after which the /// thread that owns that can do some actual work. @@ -130,10 +130,10 @@ private: ACE_Select_Reactor_Token &token_; /// Flag that indicate whether the thread that created this object - /// owns the token or not. A value of 0 indicates that this class - /// hasnt got the token (and hence the thread) and a value of 1 + /// owns the token or not. A value of false indicates that this class + /// hasnt got the token (and hence the thread) and a value of true /// vice-versa. - int owner_; + bool owner_; }; diff --git a/ACE/ace/TP_Reactor.inl b/ACE/ace/TP_Reactor.inl index b4fa3c258d1..8e38e339c32 100644 --- a/ACE/ace/TP_Reactor.inl +++ b/ACE/ace/TP_Reactor.inl @@ -52,17 +52,17 @@ ACE_INLINE ACE_TP_Token_Guard::ACE_TP_Token_Guard (ACE_Select_Reactor_Token &token) : token_ (token), - owner_ (0) + owner_ (false) { } ACE_INLINE ACE_TP_Token_Guard::~ACE_TP_Token_Guard (void) { - if (this->owner_ == 1) + if (this->owner_) { ACE_MT (this->token_.release ()); - this->owner_ = 0; + this->owner_ = false; } } @@ -74,11 +74,11 @@ ACE_TP_Token_Guard::release_token (void) ACE_MT (this->token_.release ()); // We are not the owner anymore.. - this->owner_ = 0; + this->owner_ = false; } } -ACE_INLINE int +ACE_INLINE bool ACE_TP_Token_Guard::is_owner (void) { return this->owner_; diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h index 44513e885e4..a06e7bb84d0 100644 --- a/ACE/ace/config-hpux-11.00.h +++ b/ACE/ace/config-hpux-11.00.h @@ -27,9 +27,6 @@ // gcc 2.95.2 supplies the ssize_t typedef. # define ACE_HAS_SSIZE_T -// We have to explicitly instantiate static template members -# define ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION - // gcc 3.0 claims to have wide character stuff, but (at least the version // built by HP) can't actually compile it. It refers to a wctype.h file // that's only available with aC++. -- cgit v1.2.1