ChangeLogTag: Mon Feb 28 21:32:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 29 insertions, 50 deletions

diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp
index e6fa2c22f42..7fd3cf0b9d3 100644
--- a/TAO/tao/Messaging/MessagingC.cpp
+++ b/TAO/tao/Messaging/MessagingC.cpp
@@ -95,14 +95,11 @@ void
 Messaging::ExceptionHolder::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExceptionHolder *_tao_tmp_pointer =
-    static_cast<
-        ExceptionHolder *> (
-        _tao_void_pointer
-      );
+    static_cast<ExceptionHolder *> (_tao_void_pointer);
   CORBA::remove_ref (_tao_tmp_pointer);
 }
 
-CORBA::Boolean Messaging::ExceptionHolder::_tao_marshal_v (TAO_OutputCDR & strm)
+CORBA::Boolean Messaging::ExceptionHolder::_tao_marshal_v (TAO_OutputCDR & strm) const
 {
   return this->_tao_marshal__Messaging_ExceptionHolder (strm);
 }
@@ -355,7 +352,7 @@ OBV_Messaging::ExceptionHolder::~ExceptionHolder (void)
 {}
 
 CORBA::Boolean
-OBV_Messaging::ExceptionHolder::_tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &strm)
+OBV_Messaging::ExceptionHolder::_tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &strm) const
 {
   return _tao_marshal_state (strm);
 }
@@ -459,7 +456,7 @@ operator<< (
   return
     CORBA::ValueBase::_tao_marshal (
         strm,
-        const_cast<Messaging::ExceptionHolder *> (_tao_valuetype),
+        _tao_valuetype,
         reinterpret_cast<ptrdiff_t> (&Messaging::ExceptionHolder::_downcast)
       );
 }
@@ -477,7 +474,7 @@ operator>> (
 // be\be_visitor_valuetype/marshal_cs.cpp:44
 
 CORBA::Boolean
-OBV_Messaging::ExceptionHolder::_tao_marshal_state (TAO_OutputCDR &strm)
+OBV_Messaging::ExceptionHolder::_tao_marshal_state (TAO_OutputCDR &strm) const
 {
   return (
       (strm << CORBA::Any::from_boolean (_pd_is_system_exception)) &&
diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h
index 0b744a7cad6..19d12c03f78 100644
--- a/TAO/tao/Messaging/MessagingC.h
+++ b/TAO/tao/Messaging/MessagingC.h
@@ -175,7 +175,7 @@ namespace Messaging
     
     virtual ~ExceptionHolder (void);
     
-    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
+    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const;
     virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
     
   private:
@@ -184,7 +184,7 @@ namespace Messaging
     
   protected:
     virtual CORBA::Boolean
-    _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &) = 0;
+    _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &) const = 0;
     
     virtual CORBA::Boolean
     _tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &) = 0;
@@ -393,12 +393,12 @@ namespace OBV_Messaging
     
   protected:
     virtual CORBA::Boolean
-    _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &);
+    _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &) const;
     
     virtual CORBA::Boolean
     _tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &);
     
-    CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &);
+    CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &) const;
     CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &);
   
   private:
diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp
index a6515cb8b1a..1e4a7d6ab94 100644
--- a/TAO/tao/Messaging/MessagingS.cpp
+++ b/TAO/tao/Messaging/MessagingS.cpp
@@ -213,7 +213,7 @@ TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable::hash (const char *str, unsigned
   return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
 }
 
-const struct TAO_operation_db_entry *
+const TAO_operation_db_entry *
 TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
 {
   enum
@@ -228,7 +228,7 @@ TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable::lookup (const char *str, unsign
       WORDLIST_SIZE = 9
     };
 
-  static const struct TAO_operation_db_entry  wordlist[] =
+  static const TAO_operation_db_entry  wordlist[] =
     {
       {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},
       {"_is_a", &POA_Messaging::ReplyHandler::_is_a_skel, 0},
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
index ee8e4343fd0..4581f00f45b 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
+++ b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
@@ -53,7 +53,6 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_visitor_valuetype/valuetype_cs.cpp:66
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::add_ref (
     TAO_Default_ORT::ObjectReferenceTemplate * p
@@ -62,7 +61,6 @@ TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::add_ref (
   CORBA::add_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::remove_ref (
     TAO_Default_ORT::ObjectReferenceTemplate * p
@@ -71,7 +69,6 @@ TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::remove_ref (
   CORBA::remove_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::release (
     TAO_Default_ORT::ObjectReferenceTemplate * p
@@ -96,14 +93,11 @@ void
 TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer)
 {
   ObjectReferenceTemplate *_tao_tmp_pointer =
-    static_cast<
-        ObjectReferenceTemplate *> (
-        _tao_void_pointer
-      );
+    static_cast<ObjectReferenceTemplate *> (_tao_void_pointer);
   CORBA::remove_ref (_tao_tmp_pointer);
 }
 
-CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_v (TAO_OutputCDR & strm)
+CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_v (TAO_OutputCDR & strm) const
 {
   return this->_tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (strm);
 }
@@ -166,7 +160,7 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
 {}
 
 CORBA::Boolean
-OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &strm)
+OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &strm) const
 {
   return _tao_marshal_state (strm);
 }
@@ -210,7 +204,7 @@ operator<< (
   return
     CORBA::ValueBase::_tao_marshal (
         strm,
-        const_cast<TAO_Default_ORT::ObjectReferenceTemplate *> (_tao_valuetype),
+        _tao_valuetype,
         reinterpret_cast<ptrdiff_t> (&TAO_Default_ORT::ObjectReferenceTemplate::_downcast)
       );
 }
@@ -228,10 +222,10 @@ operator>> (
 // be\be_visitor_valuetype/marshal_cs.cpp:44
 
 CORBA::Boolean
-OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_state (TAO_OutputCDR &)
+OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_state (TAO_OutputCDR &) const
 {
   return (
-      1
+      true
     );
 }
 
@@ -239,12 +233,12 @@ CORBA::Boolean
 OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR &)
 {
   return (
-    1
+    true
   );
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1619
+// be\be_visitor_root/root.cpp:1620
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.h b/TAO/tao/ObjRefTemplate/Default_ORTC.h
index 67e51b497e1..dca192e206a 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.h
+++ b/TAO/tao/ObjRefTemplate/Default_ORTC.h
@@ -134,7 +134,7 @@ namespace TAO_Default_ORT
     
     virtual ~ObjectReferenceTemplate (void);
     
-    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
+    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const;
     virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
     
   private:
@@ -143,7 +143,7 @@ namespace TAO_Default_ORT
     
   protected:
     virtual CORBA::Boolean
-    _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &) = 0;
+    _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &) const = 0;
     
     virtual CORBA::Boolean
     _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &) = 0;
@@ -185,12 +185,12 @@ namespace OBV_TAO_Default_ORT
     
   protected:
     virtual CORBA::Boolean
-    _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &);
+    _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &) const;
     
     virtual CORBA::Boolean
     _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &);
     
-    CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &);
+    CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &) const;
     CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &);
   
   private:
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
index fd6b9909f4c..f6c962047ef 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
@@ -55,7 +55,7 @@ namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:480
+  // be\be_visitor_arg_traits.cpp:492
 
 #if !defined (_CORBA_STRINGSEQ__ARG_TRAITS_CS_)
 #define _CORBA_STRINGSEQ__ARG_TRAITS_CS_
@@ -78,7 +78,6 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_visitor_valuetype/valuetype_cs.cpp:66
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::add_ref (
     PortableInterceptor::ObjectReferenceFactory * p
@@ -87,7 +86,6 @@ TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::add_ref (
   CORBA::add_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::remove_ref (
     PortableInterceptor::ObjectReferenceFactory * p
@@ -96,7 +94,6 @@ TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::remove_ref (
   CORBA::remove_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::release (
     PortableInterceptor::ObjectReferenceFactory * p
@@ -121,10 +118,7 @@ void
 PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor (void *_tao_void_pointer)
 {
   ObjectReferenceFactory *_tao_tmp_pointer =
-    static_cast<
-        ObjectReferenceFactory *> (
-        _tao_void_pointer
-      );
+    static_cast<ObjectReferenceFactory *> (_tao_void_pointer);
   CORBA::remove_ref (_tao_tmp_pointer);
 }
 
@@ -174,7 +168,6 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
 // TAO_IDL - Generated from
 // be\be_visitor_valuetype/valuetype_cs.cpp:66
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::add_ref (
     PortableInterceptor::ObjectReferenceTemplate * p
@@ -183,7 +176,6 @@ TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::add_ref (
   CORBA::add_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::remove_ref (
     PortableInterceptor::ObjectReferenceTemplate * p
@@ -192,7 +184,6 @@ TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::remove_ref (
   CORBA::remove_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::release (
     PortableInterceptor::ObjectReferenceTemplate * p
@@ -217,10 +208,7 @@ void
 PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer)
 {
   ObjectReferenceTemplate *_tao_tmp_pointer =
-    static_cast<
-        ObjectReferenceTemplate *> (
-        _tao_void_pointer
-      );
+    static_cast<ObjectReferenceTemplate *> (_tao_void_pointer);
   CORBA::remove_ref (_tao_tmp_pointer);
 }
 
@@ -356,7 +344,7 @@ operator<< (
   return
     CORBA::ValueBase::_tao_marshal (
         strm,
-        const_cast<PortableInterceptor::ObjectReferenceFactory *> (_tao_valuetype),
+        _tao_valuetype,
         reinterpret_cast<ptrdiff_t> (&PortableInterceptor::ObjectReferenceFactory::_downcast)
       );
 }
@@ -405,7 +393,7 @@ operator<< (
   return
     CORBA::ValueBase::_tao_marshal (
         strm,
-        const_cast<PortableInterceptor::ObjectReferenceTemplate *> (_tao_valuetype),
+        _tao_valuetype,
         reinterpret_cast<ptrdiff_t> (&PortableInterceptor::ObjectReferenceTemplate::_downcast)
       );
 }
@@ -494,7 +482,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1619
+// be\be_visitor_root/root.cpp:1620
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)