Wed Jun 29 11:13:02 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * tao/AnyTypeCode/TypeCode_Case_T.h:
        * tao/Basic_Argument_T.h:
        * tao/Invocation_Adapter.h:
        * tao/Bounded_Basic_String_Sequence_T.h:
        * tao/Generic_Sequence_T.h:
          Layout changes

        * tao/Object.cpp:
          Fixed coverity errors

        * tao/Incoming_Message_Stack.h:
          Removed borland workaround

8 files changed, 33 insertions, 17 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 568209e5530..28ded7726dd 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Wed Jun 29 11:13:02 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/TypeCode_Case_T.h:
+        * tao/Basic_Argument_T.h:
+        * tao/Invocation_Adapter.h:
+        * tao/Bounded_Basic_String_Sequence_T.h:
+        * tao/Generic_Sequence_T.h:
+          Layout changes
+
+        * tao/Object.cpp:
+          Fixed coverity errors
+
+        * tao/Incoming_Message_Stack.h:
+          Removed borland workaround
+
 Wed Jun 29 10:47:05 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/ORB_Core.cpp:
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
index 548199bd4ad..a5e4b057816 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
@@ -114,8 +114,7 @@ namespace TAO
       virtual CORBA::Any * label (void) const;
       virtual bool marshal_label (TAO_OutputCDR & cdr) const;
       virtual bool equal_label (CORBA::ULong index,
-                                CORBA::TypeCode_ptr tc
-                                ) const;
+                                CORBA::TypeCode_ptr tc) const;
       //@}
 
     private:
diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h
index e6a8d25cc61..9f20d9fd403 100644
--- a/TAO/tao/Basic_Argument_T.h
+++ b/TAO/tao/Basic_Argument_T.h
@@ -141,7 +141,6 @@ namespace TAO
     S x_;
   };
 
-
   /**
    * @struct Basic_Arg_Traits_T
    *
diff --git a/TAO/tao/Bounded_Basic_String_Sequence_T.h b/TAO/tao/Bounded_Basic_String_Sequence_T.h
index c1b1c57f398..4c09f1305f2 100644
--- a/TAO/tao/Bounded_Basic_String_Sequence_T.h
+++ b/TAO/tao/Bounded_Basic_String_Sequence_T.h
@@ -40,7 +40,7 @@ public:
   typedef details::generic_sequence<value_type, allocation_traits, element_traits> implementation_type;
 
   /// @copydoc TAO::details::generic_sequence::generic_sequence()
-  inline bounded_basic_string_sequence()
+  inline bounded_basic_string_sequence(void)
     : impl_()
   {}
   /// @copydoc TAO::details::generic_sequence::generic_sequence()
diff --git a/TAO/tao/Generic_Sequence_T.h b/TAO/tao/Generic_Sequence_T.h
index 7b24c0e297c..f977d4af29f 100644
--- a/TAO/tao/Generic_Sequence_T.h
+++ b/TAO/tao/Generic_Sequence_T.h
@@ -107,7 +107,7 @@ public:
   typedef range_checking<value_type,true> range;
 
   /// Default constructor.
-  generic_sequence()
+  generic_sequence(void)
     : maximum_(allocation_traits::default_maximum())
     , length_(0)
     , buffer_(allocation_traits::default_buffer_allocation())
diff --git a/TAO/tao/Incoming_Message_Stack.h b/TAO/tao/Incoming_Message_Stack.h
index 369f4c9da08..14a69d89183 100644
--- a/TAO/tao/Incoming_Message_Stack.h
+++ b/TAO/tao/Incoming_Message_Stack.h
@@ -21,10 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x630)
-#include /**/ "tao/TAO_Export.h"
-#endif
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Allocator;
 ACE_END_VERSIONED_NAMESPACE_DECL
@@ -41,11 +37,7 @@ namespace TAO
  * Internal class, providing stack functionality for TAO_Queued_Data
  * objects.  Stack operations don't require memory allocation.
 */
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x630)
-class TAO_Export Incoming_Message_Stack
-#else
 class Incoming_Message_Stack
-#endif
 {
 public:
   /// default constructor, initiliazes empty stack.
diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h
index 844c446d424..958083c8945 100644
--- a/TAO/tao/Invocation_Adapter.h
+++ b/TAO/tao/Invocation_Adapter.h
@@ -149,7 +149,7 @@ namespace TAO
     /// Helper method that prepares the necessary stuff for a remote
     /// invocation.
 
-    /*
+    /**
      * This method does the following essential activities needed for
      * a remote invocation.
      *
@@ -237,7 +237,6 @@ namespace TAO
     Invocation_Adapter & operator= (const Invocation_Adapter &);
 
   protected:
-
     /// The target object on which this invocation is carried out.
     CORBA::Object_ptr target_;
 
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 7725726c9ac..281f168c93f 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -742,7 +742,14 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj)
           TAO_Profile *pfile = connector_registry->create_profile (cdr);
 
           if (pfile != 0)
-            mp.give_profile (pfile);
+            {
+              if (mp.give_profile (pfile) == -1)
+              {
+                ACE_ERROR ((LM_ERROR,
+                            ACE_TEXT ("TAO (%P|%t) ERROR: give_profile\n")
+                            ACE_TEXT (" returned -1\n")));
+              }
+            }
         }
 
       // Make sure we got some profiles!
@@ -863,7 +870,12 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
               TAO_Profile *pfile = connector_registry->create_profile (cdr);
               if (pfile != 0)
                 {
-                  mp.give_profile (pfile);
+                  if (mp.give_profile (pfile) == -1)
+                    {
+                      ACE_ERROR ((LM_ERROR,
+                                  ACE_TEXT ("TAO (%P|%t) ERROR: give_profile\n")
+                                  ACE_TEXT (" returned -1\n")));
+                    }
                 }
             }