ChangeLogTag: Wed Mar 2 09:57:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 25 insertions, 69 deletions

diff --git a/TAO/tao/IFR_Client_Adapter.cpp b/TAO/tao/IFR_Client_Adapter.cpp
index 5089b6156db..5465433b0e0 100644
--- a/TAO/tao/IFR_Client_Adapter.cpp
+++ b/TAO/tao/IFR_Client_Adapter.cpp
@@ -3,14 +3,10 @@
 #include "tao/IFR_Client_Adapter.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (tao, 
-           IFR_Client_Adapter, 
+ACE_RCSID (tao,
+           IFR_Client_Adapter,
            "$Id$")
 
-TAO_IFR_Client_Adapter::~TAO_IFR_Client_Adapter (void)
-{
-}
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Dynamic_Service<TAO_IFR_Client_Adapter>;
diff --git a/TAO/tao/IFR_Client_Adapter.h b/TAO/tao/IFR_Client_Adapter.h
index 67e4256343d..9e8afc3e10f 100644
--- a/TAO/tao/IFR_Client_Adapter.h
+++ b/TAO/tao/IFR_Client_Adapter.h
@@ -63,8 +63,6 @@ namespace CORBA
 class TAO_Export TAO_IFR_Client_Adapter : public ACE_Service_Object
 {
 public:
-  virtual ~TAO_IFR_Client_Adapter (void);
-
   virtual CORBA::Boolean interfacedef_cdr_insert (
       TAO_OutputCDR &cdr,
       CORBA::InterfaceDef_ptr object_type
diff --git a/TAO/tao/Messaging/diffs/Messaging.diff b/TAO/tao/Messaging/diffs/Messaging.diff
index 6f7d6cb50b7..29699e7d8ad 100644
--- a/TAO/tao/Messaging/diffs/Messaging.diff
+++ b/TAO/tao/Messaging/diffs/Messaging.diff
@@ -1,34 +1,18 @@
---- orig/MessagingC.h	2005-02-18 12:11:33.256985600 +0100
-+++ MessagingC.h	2005-02-18 12:13:24.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -36,6 +36,10 @@
- 
- #include "ace/config-all.h"
+--- orig/MessagingC.h	2005-02-22 15:22:16.445811200 +0100
++++ MessagingC.h	2005-02-22 15:24:54.643288000 +0100
+@@ -40,6 +40,10 @@
+ # pragma once
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
  
 +#ifndef TAO_MESSAGING_SAFE_INCLUDE
 +#error "You should not include MessagingC.h directly, use Messaging.h"
 +#endif /* !TAO_MESSAGING_SAFE_INCLUDE */
 +
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
---- orig/MessagingC.cpp	2005-02-18 12:11:33.267000000 +0100
-+++ MessagingC.cpp	2005-02-18 12:13:24.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+ #include "messaging_export.h"
+ #include "tao/Valuetype/ValueBase.h"
+ #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
+--- orig/MessagingC.cpp	2005-02-22 15:22:16.445811200 +0100
++++ MessagingC.cpp	2005-02-22 15:24:20.994904000 +0100
 @@ -29,7 +29,7 @@
  // be\be_codegen.cpp:302
  
@@ -38,16 +22,8 @@
  #include "tao/CDR.h"
  #include "tao/Object_T.h"
  #include "tao/ORB_Core.h"
---- orig/MessagingA.cpp	2005-02-18 12:11:33.267000000 +0100
-+++ MessagingA.cpp	2005-02-18 12:13:24.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/MessagingA.cpp	2005-02-22 15:22:16.445811200 +0100
++++ MessagingA.cpp	2005-02-22 15:24:27.514278400 +0100
 @@ -25,7 +25,7 @@
  // Information about TAO is available at:
  //     http://www.cs.wustl.edu/~schmidt/TAO.html
@@ -57,24 +33,18 @@
  #include "tao/Typecode.h"
  #include "tao/CDR.h"
  #include "tao/Any.h"
---- orig/MessagingS.h	2005-02-18 12:11:33.256985600 +0100
-+++ MessagingS.h	2005-02-18 12:13:24.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
+--- orig/MessagingS.h	2005-02-22 15:22:16.445811200 +0100
++++ MessagingS.h	2005-02-22 15:23:21.078748800 +0100
+@@ -33,11 +33,8 @@
  
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -34,9 +34,7 @@
  #include /**/ "ace/pre.h"
  
+-#include "MessagingC.h"
++#include "Messaging.h"
  #include "tao/PollableS.h"
 -#include "tao/Messaging/Messaging_SyncScope_PolicyS.h"
 -#include "tao/Messaging/Messaging_RT_PolicyS.h"
 -#include "tao/Messaging/Messaging_No_ImplS.h"
-+#include "tao/Messaging/Messaging.h"
  #include "tao/OctetSeqS.h"
- #include "MessagingC.h"
  
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff b/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff
index f8b0a8deac7..f53a2f3b234 100644
--- a/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff
+++ b/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff
@@ -1,13 +1,5 @@
---- orig/Messaging_No_ImplC.h	2005-02-18 12:11:32.265560000 +0100
-+++ Messaging_No_ImplC.h	2005-02-18 12:13:24.000000000 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/Messaging_No_ImplC.h	2005-02-22 15:22:14.493003200 +0100
++++ Messaging_No_ImplC.h	2005-02-22 15:22:23.485934400 +0100
 @@ -52,6 +52,11 @@
  #include "tao/PolicyC.h"
  #include "tao/PollableC.h"
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index bacd99afe05..aa3789961d6 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -249,7 +249,7 @@ TAO_CORBA_Policy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
   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_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
 {
   enum
@@ -264,7 +264,7 @@ TAO_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len
       WORDLIST_SIZE = 11
     };
 
-  static const struct TAO_operation_db_entry  wordlist[] =
+  static const TAO_operation_db_entry  wordlist[] =
     {
       {"",0,0},{"",0,0},{"",0,0},{"",0,0},
       {"copy", &POA_CORBA::Policy::copy_skel, &POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy},
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
index 180323c0e68..3dc52c7a8e5 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
@@ -49,7 +49,7 @@ Server_Task::svc (void)
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Visual_i * server_impl;
+      Visual_i * server_impl = 0;
       ACE_NEW_RETURN (server_impl, Visual_i (sorb_.in ()), 1);
 
       PortableServer::ObjectId_var id =