Wed Nov 23 22:24:38 2005 Chris Cleeland <cleeland_c@ociweb.com>

Try to fix warnings on VC8 and other Windows compilers.

4 files changed, 42 insertions, 11 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index e36e95afca5..ce3ad7771a6 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,18 +1,40 @@
+Wed Nov 23 22:24:38 2005  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Notify/Event_Manager.h:
+
+	  Explicitly declared a private copy constructor and assignment
+	  operator for TAO_Notify_Event_Manager.  By not declaring them,
+	  the compiler has to generate them.  In generating them, it needs
+	  to be able to know the complete type for the template arguments
+	  to its ACE_Auto_Ptr<> private instances.  Various circular
+	  dependencies make that difficult to impossible without
+	  restructuring, so we take this approach instead.
+
+	  This change should eliminate warnings from Windows-based
+	  compilers (e.g., VC8) about calling delete through a pointer to
+	  an incomplete type while instantiating ACE_Auto_Ptr<> methods.
+	
+        * orbsvcs/orbsvcs/Notify/Object.h:
+        * orbsvcs/orbsvcs/Notify/Object.cpp:
+
+	  Only needed a forward decl in Object.h; we only needed the
+	  complete type in Object.cpp.  Maybe this will help footprint.
+
 Wed Nov 23 09:20:03 2005  Chris Cleeland  <cleeland_c@ociweb.com>
 
-	  Fix a few things I should have caught in the Great Merge, but
-	  missed.
+          Fix a few things I should have caught in the Great Merge, but
+          missed.
 
-	* orbsvcs/orbsvcs/Notify/Consumer.cpp (dispatch_request): Change
-	  from using deprecated TAO_DEFAULT_MINOR_CODE to TAO::VMCID.
+        * orbsvcs/orbsvcs/Notify/Consumer.cpp (dispatch_request): Change
+          from using deprecated TAO_DEFAULT_MINOR_CODE to TAO::VMCID.
+
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp: Use
+          real C++ static_cast<> rather than deprecated ACE_static_cast().
 
-	* orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp: Use
-	  real C++ static_cast<> rather than deprecated ACE_static_cast().
-	
 Wed Nov 23 14:53:09 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc:
-        
+
           Added an 'after' line to one project to avoid concurrency
           collisions in VC8 builds, since the 2 projects in this file
           share IDL.
@@ -44,8 +66,8 @@ Tue Nov 22 22:58:55 2005  Chris Cleeland  <cleeland@ociweb.com>
         * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp:
         * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp:
 
-	  Fixed warnings about preferring one conversion over another
-	  from a _var that appeared on a couple of platforms.
+          Fixed warnings about preferring one conversion over another
+          from a _var that appeared on a couple of platforms.
 
 Tue Nov 22 07:49:59 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
index 20d6aad400d..f5dea3a1df1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
@@ -16,6 +16,7 @@
 #include "ace/Auto_Ptr.h"
 
 #include "Refcountable.h"
+
 #include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -114,6 +115,13 @@ protected:
   void un_publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq ACE_ENV_ARG_DECL);
 
 private:
+  // Disallow copying and assignment; we don't need them
+  // and if we let the compiler generate them it needs the
+  // full declaration of the template arguments for ACE_Auto_Ptr<>
+  // below.
+  TAO_Notify_Event_Manager (TAO_Notify_Event_Manager&);
+  TAO_Notify_Event_Manager& operator= (TAO_Notify_Event_Manager&);
+
   /// Consumer Map
   ACE_Auto_Ptr< TAO_Notify_Consumer_Map > consumer_map_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
index f14cd7894d6..999f1496c63 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
@@ -8,6 +8,7 @@
 #include "ThreadPool_Task.h"
 #include "Reactive_Task.h"
 #include "tao/debug.h"
+#include "Event_Manager.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "Object.inl"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h
index 29a673c8aad..07ec0156f51 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h
@@ -26,7 +26,6 @@
 #include "Worker_Task.h"
 #include "Refcountable.h"
 #include "Name_Value_Pair.h"
-#include "Event_Manager.h"
 
 #include "orbsvcs/NotifyExtC.h"
 
@@ -37,6 +36,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Notify_POA_Helper;
 class TAO_Notify_Timer;
 class TAO_Notify_RT_Builder;
+class TAO_Notify_Event_Manager;
 
 /**
  * @class TAO_Notify_Object