Tue Apr 28 08:00:12 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * tao/AnyTypeCode/Any_Unknown_IDL_Type.{h,cpp}:
          Return a const object from lock_i, this fixes bugzilla 3665. Thanks to
          Rob Beekmans <r dot a dot beekmans at philips dot com> for reporting this.
          It is really a diab compiler bug but we can easily work around it

        * tao/AnyTypeCode/Enum_TypeCode.cpp:
        * tao/AnyTypeCode/Enum_TypeCode_Static.cpp:
        * tao/CORBALOC_Parser.cpp:
        * tao/Intrusive_Ref_Count_Handle_T.h
          layout change

7 files changed, 21 insertions, 15 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d3b264fd418..0d15371287d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Tue Apr 28 08:00:12 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/Any_Unknown_IDL_Type.{h,cpp}:
+          Return a const object from lock_i, this fixes bugzilla 3665. Thanks to
+          Rob Beekmans <r dot a dot beekmans at philips dot com> for reporting this.
+          It is really a diab compiler bug but we can easily work around it
+
+        * tao/AnyTypeCode/Enum_TypeCode.cpp:
+        * tao/AnyTypeCode/Enum_TypeCode_Static.cpp:
+        * tao/CORBALOC_Parser.cpp:
+        * tao/Intrusive_Ref_Count_Handle_T.h
+          layout change
+
 Tue Apr 28 01:51:44 UTC 2009  Yan Dai  <dai_y@ociweb.com>
 
         * orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp:
@@ -8,9 +21,9 @@ Tue Apr 28 01:51:44 UTC 2009  Yan Dai  <dai_y@ociweb.com>
 Mon Apr 27 16:08:54 UTC 2009  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * orbsvcs/Notify_Service/README:
-          
+
           Fixed typo
-        
+
 
 Mon Apr 27 15:54:55 UTC 2009  Phil Mesnier  <mesnier_p@ociweb.com>
 
diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
index 0c73afcacba..ea17e3cba50 100644
--- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
@@ -17,7 +17,7 @@ ACE_RCSID (AnyTypeCode,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::Unknown_IDL_Type::LOCK
+TAO::Unknown_IDL_Type::LOCK const
 TAO::Unknown_IDL_Type::lock_i (void)
 {
   static LOCK base_lock_ (new ACE_Lock_Adapter<TAO_SYNCH_MUTEX>());
diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h
index 27072edfb2b..058e25f707b 100644
--- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h
+++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h
@@ -54,8 +54,7 @@ namespace TAO
     virtual TAO_InputCDR &_tao_get_cdr (void);
     virtual int _tao_byte_order (void) const;
 
-    virtual void _tao_decode (TAO_InputCDR &
-                             );
+    virtual void _tao_decode (TAO_InputCDR &);
 
     virtual CORBA::Boolean to_object (CORBA::Object_ptr &) const;
     virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const;
@@ -82,7 +81,7 @@ namespace TAO
     typedef ACE_Refcounted_Auto_Ptr<ACE_Lock,
                                     ACE_Lock_Adapter<TAO_SYNCH_MUTEX> >
       LOCK;
-    static LOCK lock_i (void);
+    static LOCK const lock_i (void);
     LOCK const lock_;
     mutable TAO_InputCDR cdr_;
   };
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
index 00bbd2c3474..503ab2b5c47 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
@@ -100,8 +100,7 @@ TAO::TypeCode::Enum<StringType,
 
       char const * const lhs_name =
         Traits<StringType>::get_string (lhs_enumerator);
-      char const * const rhs_name = tc->member_name (i
-                                                    );
+      char const * const rhs_name = tc->member_name (i);
 
       if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
         return false;
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
index 005de662c30..01fb53a3c4c 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
@@ -98,8 +98,7 @@ TAO::TypeCode::Enum<char const *,
 
       char const * const lhs_name =
         Traits<char const *>::get_string (lhs_enumerator);
-      char const * const rhs_name = tc->member_name (i
-                                                    );
+      char const * const rhs_name = tc->member_name (i);
 
       if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
         return false;
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index ef74e74768d..901cd0159b3 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -51,9 +51,7 @@ TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb,
                                               TAO_MProfile &mprofile)
 {
   // Create a TAO_Stub.
-  TAO_Stub *data = orb->orb_core ()->create_stub ((const char *) 0,
-                                                  mprofile
-                                                 );
+  TAO_Stub *data = orb->orb_core ()->create_stub ((const char *) 0, mprofile);
 
   TAO_Stub_Auto_Ptr safe_data (data);
 
diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.h b/TAO/tao/Intrusive_Ref_Count_Handle_T.h
index 0bf263cedce..c936b9e039d 100644
--- a/TAO/tao/Intrusive_Ref_Count_Handle_T.h
+++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.h
@@ -117,7 +117,6 @@ public:
   /// Always leaves the smart pointer in the "nil" state upon return.
   T* _retn (void);
 
-
 private:
 
   /// Claim a "copy" of the reference-counted object by adding
@@ -132,7 +131,6 @@ private:
   /// in the "nil" state upon its return.
   void drop (void);
 
-
   /// The underlying pointer to the (intrusively) reference-counted object.
   /// Set to 0 when this smart pointer is in the "nil" state.  Otherwise,
   /// this smart pointer always owns a (reference-counted) "copy" of the