diff options
| -rw-r--r-- | TAO/ChangeLog | 19 | ||||
| -rw-r--r-- | TAO/tao/LocalObject.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/ORB.h | 4 | ||||
| -rw-r--r-- | TAO/tao/ORB.i | 6 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.h | 4 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.i | 6 | ||||
| -rw-r--r-- | TAO/tao/Principal.h | 4 | ||||
| -rw-r--r-- | TAO/tao/Principal.i | 6 | ||||
| -rw-r--r-- | TAO/tao/Profile.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/Profile.h | 4 |
10 files changed, 40 insertions, 23 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index bc3e08b5505..46b930b21cf 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,22 @@ +Wed Jul 19 12:31:50 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + + * tao/LocalObject.cpp: + * tao/ORB.h: + * tao/ORB.i: + * tao/ORB_Core.h: + * tao/ORB_Core.i: + * tao/Principal.h: + * tao/Principal.i: + * tao/Profile.h: + * tao/Profile.cpp: + + In my change from Mon Jul 17 14:40:43 UTC 2006, I modified these + files to use an ACE_Atomic_Op<> with an unsigned long. They all + had instances where unsigned long and CORBA::ULong were being + mixed which causes warnings with some 64-bit compilers. I have + modified these to all use unsigned long in places where + CORBA::ULong was previously used. + Wed Jul 19 12:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * orbscvs/orbsvcs/IFRService/*.S*.*: diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp index 9a7368f9ec4..610cb5cfb97 100644 --- a/TAO/tao/LocalObject.cpp +++ b/TAO/tao/LocalObject.cpp @@ -233,9 +233,7 @@ TAO_Local_RefCounted_Object::_add_ref (void) void TAO_Local_RefCounted_Object::_remove_ref (void) { - const CORBA::ULong new_count = --this->refcount_; - - if (new_count == 0) + if (--this->refcount_ == 0) delete this; } diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 41f0bba0d24..8501413f64d 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -556,8 +556,8 @@ namespace CORBA #endif // Reference counting... - CORBA::ULong _incr_refcnt (void); - CORBA::ULong _decr_refcnt (void); + unsigned long _incr_refcnt (void); + unsigned long _decr_refcnt (void); /// Set the IOR flag. void _use_omg_ior_format (CORBA::Boolean ior); diff --git a/TAO/tao/ORB.i b/TAO/tao/ORB.i index 6a34deb048b..e4543a30593 100644 --- a/TAO/tao/ORB.i +++ b/TAO/tao/ORB.i @@ -8,16 +8,16 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // ORB specific // --------------------------------------------------------------------------- -ACE_INLINE CORBA::ULong +ACE_INLINE unsigned long CORBA::ORB::_incr_refcnt (void) { return ++this->refcount_; } -ACE_INLINE CORBA::ULong +ACE_INLINE unsigned long CORBA::ORB::_decr_refcnt (void) { - CORBA::ULong count = --this->refcount_; + unsigned long count = --this->refcount_; if (count != 0) { diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 3212778f74a..8c021b5a973 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -700,8 +700,8 @@ public: ); /// Reference counting... - CORBA::ULong _incr_refcnt (void); - CORBA::ULong _decr_refcnt (void); + unsigned long _incr_refcnt (void); + unsigned long _decr_refcnt (void); /// Register the handle of an open connection with the ORB Core /// handle set. This handle set will be used to explicitly remove diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index 5ec66789335..ca3defce178 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -13,16 +13,16 @@ TAO_ORB_Core::configuration (void) const return this->config_; } -ACE_INLINE CORBA::ULong +ACE_INLINE unsigned long TAO_ORB_Core::_incr_refcnt (void) { return this->refcount_++; } -ACE_INLINE CORBA::ULong +ACE_INLINE unsigned long TAO_ORB_Core::_decr_refcnt (void) { - CORBA::ULong count = --this->refcount_; + unsigned long count = --this->refcount_; if (count != 0) return count; diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h index fbdb6c9df84..4607ce51e5c 100644 --- a/TAO/tao/Principal.h +++ b/TAO/tao/Principal.h @@ -68,8 +68,8 @@ namespace CORBA static Principal * _nil (void); // = Stuff required for memory management. - CORBA::ULong _incr_refcnt (void); - CORBA::ULong _decr_refcnt (void); + unsigned long _incr_refcnt (void); + unsigned long _decr_refcnt (void); Principal (void); diff --git a/TAO/tao/Principal.i b/TAO/tao/Principal.i index 5c7ef0d666a..8ea7d1f905f 100644 --- a/TAO/tao/Principal.i +++ b/TAO/tao/Principal.i @@ -12,10 +12,10 @@ CORBA::is_nil (CORBA::Principal_ptr principal) } ACE_INLINE -CORBA::ULong +unsigned long CORBA::Principal::_decr_refcnt (void) { - const CORBA::ULong new_count = --this->refcount_; + unsigned long new_count = --this->refcount_; if (new_count == 0) delete this; @@ -34,7 +34,7 @@ CORBA::release (CORBA::Principal_ptr principal) } ACE_INLINE -CORBA::ULong +unsigned long CORBA::Principal::_incr_refcnt (void) { return ++this->refcount_; diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index ef5900c8b6c..4485d84c13d 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -76,16 +76,16 @@ TAO_Profile::~TAO_Profile (void) //@@ TAO_PROFILE_SPL_DESTRUCTOR_ADD_HOOK } -CORBA::ULong +unsigned long TAO_Profile::_incr_refcnt (void) { return this->refcount_.increment (); } -CORBA::ULong +unsigned long TAO_Profile::_decr_refcnt (void) { - CORBA::ULong count = this->refcount_.decrement (); + unsigned long count = this->refcount_.decrement (); if (count != 0) return count; diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h index d9164b8e94c..dd9ee9ecfca 100644 --- a/TAO/tao/Profile.h +++ b/TAO/tao/Profile.h @@ -75,11 +75,11 @@ public: TAO_ORB_Core *orb_core (void) const; /// Increase the reference count by one on this object. - CORBA::ULong _incr_refcnt (void); + unsigned long _incr_refcnt (void); /// Decrement the object's reference count. When this count goes to /// 0 this object will be deleted. - CORBA::ULong _decr_refcnt (void); + unsigned long _decr_refcnt (void); /// Keep a pointer to the forwarded profile void forward_to (TAO_MProfile *mprofiles); |