Thu Mar 22 19:52:26 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 27 insertions, 67 deletions

diff --git a/TAO/tao/AnyTypeCode/Any.h b/TAO/tao/AnyTypeCode/Any.h
index 1b745ab3c2e..da2449b60db 100644
--- a/TAO/tao/AnyTypeCode/Any.h
+++ b/TAO/tao/AnyTypeCode/Any.h
@@ -152,8 +152,7 @@ namespace CORBA
 
     /// For use along with <<= of a value of aliased type when the alias must
     /// be preserved.
-    void type (TypeCode_ptr
-              );
+    void type (TypeCode_ptr);
 
     /// TAO extension, does not return a duplicate.
     CORBA::TypeCode_ptr _tao_get_typecode (void) const;
diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp
index 5067c9fe907..380ac4d5865 100644
--- a/TAO/tao/AnyTypeCode/NVList.cpp
+++ b/TAO/tao/AnyTypeCode/NVList.cpp
@@ -155,8 +155,7 @@ CORBA::NVList::add_item_consume (char *name, CORBA::Flags flags)
 {
 
   // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags
-                                               );
+  CORBA::NamedValue_ptr nv = this->add_element (flags);
 
   if (nv)
     {
@@ -176,12 +175,10 @@ CORBA::NVList::add_item_consume (char *name, CORBA::Flags flags)
 CORBA::NamedValue_ptr
 CORBA::NVList::add_value_consume (char * name,
                                   CORBA::Any * value,
-                                  CORBA::Flags flags
-                                  )
+                                  CORBA::Flags flags)
 {
   // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags
-                                               );
+  CORBA::NamedValue_ptr nv = this->add_element (flags);
 
   if (nv)
     {
@@ -203,8 +200,7 @@ CORBA::NVList::add_value_consume (char * name,
 
 //CORBA::Status
 void
-CORBA::NVList::remove (CORBA::ULong /* n */
-                       )
+CORBA::NVList::remove (CORBA::ULong /* n */)
 {
   // not implemented
   // @@ (ASG) - TODO
@@ -212,8 +208,7 @@ CORBA::NVList::remove (CORBA::ULong /* n */
 
 // Helper method
 CORBA::NamedValue_ptr
-CORBA::NVList::add_element (CORBA::Flags flags
-                            )
+CORBA::NVList::add_element (CORBA::Flags flags)
 {
   this->evaluate ();
 
@@ -245,8 +240,7 @@ CORBA::NVList::add_element (CORBA::Flags flags
 
 // return the item at location n
 CORBA::NamedValue_ptr
-CORBA::NVList::item (CORBA::ULong n
-                     )
+CORBA::NVList::item (CORBA::ULong n)
 {
   this->evaluate ();
 
@@ -264,8 +258,7 @@ CORBA::NVList::item (CORBA::ULong n
 void
 CORBA::NVList::_tao_incoming_cdr (TAO_InputCDR &cdr,
                                   int flag,
-                                  bool &lazy_evaluation
-                                  )
+                                  bool &lazy_evaluation)
 {
   // If the list is empty then using lazy evaluation is the only
   // choice.
@@ -279,9 +272,7 @@ CORBA::NVList::_tao_incoming_cdr (TAO_InputCDR &cdr,
 
   if (lazy_evaluation == false)
     {
-      this->_tao_decode (cdr,
-                         flag
-                        );
+      this->_tao_decode (cdr, flag);
       return;
     }
 
@@ -298,9 +289,7 @@ CORBA::NVList::_tao_incoming_cdr (TAO_InputCDR &cdr,
 }
 
 void
-CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr,
-                            int flag
-                            )
+CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr, int flag)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX,
              ace_mon,
@@ -350,8 +339,7 @@ CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr,
           CORBA::TypeCode_ptr tc = nv->value ()->_tao_get_typecode ();
           (void) TAO_Marshal_Object::perform_append (tc,
                                                      this->incoming_,
-                                                     &cdr
-                                                    );
+                                                     &cdr);
         }
 
       delete this->incoming_;
@@ -382,9 +370,7 @@ CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr,
 }
 
 void
-CORBA::NVList::_tao_decode (TAO_InputCDR &incoming,
-                            int flag
-                            )
+CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, int flag)
 {
   if (TAO_debug_level > 3)
     {
diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h
index f5cc31072ba..1cf6aef8f21 100644
--- a/TAO/tao/AnyTypeCode/NVList.h
+++ b/TAO/tao/AnyTypeCode/NVList.h
@@ -167,41 +167,28 @@ namespace CORBA
     ULong count (void) const;
 
     /// add an element and just initialize the flags
-    NamedValue_ptr add (Flags
-                        );
+    NamedValue_ptr add (Flags);
 
     /// add an element and initialize its name and flags
-    NamedValue_ptr add_item (const char *,
-                             Flags
-                             );
+    NamedValue_ptr add_item (const char *, Flags);
 
     /// initializes a value, name, and flags
-    NamedValue_ptr add_value (const char *,
-                              const Any &,
-                              Flags
-                              );
+    NamedValue_ptr add_value (const char *, const Any &, Flags);
 
     /// just like add_item. In addition, memory management of char *
     /// name is taken over by the NVList
-    NamedValue_ptr add_item_consume (char *,
-                                     Flags
-                                     );
+    NamedValue_ptr add_item_consume (char *, Flags);
 
     /// just like add_value. In addition, the NVList controls the
     /// memory management of the char *name and Any *value parameter
-    NamedValue_ptr add_value_consume (char *,
-                                      Any_ptr,
-                                      Flags
-                                      );
+    NamedValue_ptr add_value_consume (char *, Any_ptr, Flags);
 
     /// retrieve the item at the nth location. Raises Bounds
-    NamedValue_ptr item (ULong n
-                         );
+    NamedValue_ptr item (ULong n);
 
     //  CORBA::Status
     /// remove element at index n. Raises Bounds
-    void remove (ULong n
-                 );
+    void remove (ULong n);
 
     // The pseudo object static methods..
     static NVList * _duplicate (NVList *);
@@ -221,19 +208,14 @@ namespace CORBA
      */
     void _tao_incoming_cdr (TAO_InputCDR & cdr,
                             int flag,
-                            bool &lazy_evaluation
-                           );
+                            bool &lazy_evaluation);
 
     /// Encode the NVList into the CDR stream. @a flag masks the type of
     /// arguments (IN, OUT or INOUT) that are to be marshaled.
-    void _tao_encode (TAO_OutputCDR & cdr,
-                      int flag
-                      );
+    void _tao_encode (TAO_OutputCDR & cdr, int flag);
 
     /// Decode the NVList arguments from the @a cdr stream.
-    void _tao_decode (TAO_InputCDR & cdr,
-                      int flag
-                     );
+    void _tao_decode (TAO_InputCDR & cdr, int flag);
 
     /**
      * Return the required alignment to marshal the NVList without any
@@ -270,8 +252,7 @@ namespace CORBA
 
     /// Helper to increase the list size. This is used by all the add_
     /// methods of the NVList class
-    NamedValue_ptr add_element (Flags
-                               );
+    NamedValue_ptr add_element (Flags);
 
     /// Lazy evaluation routine to fill up the Anys in the NVList from
     /// the CDR stream.
diff --git a/TAO/tao/AnyTypeCode/NVList.inl b/TAO/tao/AnyTypeCode/NVList.inl
index d3fd8f93d3c..d0514805ceb 100644
--- a/TAO/tao/AnyTypeCode/NVList.inl
+++ b/TAO/tao/AnyTypeCode/NVList.inl
@@ -101,8 +101,7 @@ ACE_INLINE
 CORBA::ULong
 CORBA::NVList::count (void) const
 {
-  (const_cast<CORBA::NVList *> (this))->evaluate (
-    );
+  (const_cast<CORBA::NVList *> (this))->evaluate ();
 
   return this->max_;
 }
diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h
index 0eea676bc2c..0699756772e 100644
--- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h
+++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h
@@ -33,14 +33,9 @@ class TAO_AnyTypeCode_Export TAO_NVList_Adapter_Impl
   : public TAO_NVList_Adapter
 {
 public:
-  virtual void create_list (
-      CORBA::Long count,
-      CORBA::NVList_ptr &new_list
-     );
-
-  virtual void create_named_value (
-      CORBA::NamedValue_ptr &nv
-     );
+  virtual void create_list (CORBA::Long count, CORBA::NVList_ptr &new_list);
+
+  virtual void create_named_value (CORBA::NamedValue_ptr &nv);
 
   /// Used to force the initialization of the NVList adapter
   static int Initializer (void);