ChangeLogTag: Thu Jan 2 13:33:01 2003 Chad Elliott <elliott_c@ociweb.com>

20 files changed, 66 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index e462c3a9151..2648b35c759 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu Jan  2 13:33:01 2003  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/Refcounted_Auto_Ptr.i:
+
+          Added #include of ace/Log_Msg.h for ACE_ASSERT.
+
+        * bin/aix_shr:
+                      
+          Added -DTAO_INSTANTIATING_TEMPLATES to the link command line.
+
 Thu Jan  2 12:38:55 2003  Johnny Willemsen <jwillemsen@remedy.nl>
 
 	* ace/Makefile.ace: Set the dllflags in Makefile. This makes it
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index e462c3a9151..2648b35c759 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,13 @@
+Thu Jan  2 13:33:01 2003  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/Refcounted_Auto_Ptr.i:
+
+          Added #include of ace/Log_Msg.h for ACE_ASSERT.
+
+        * bin/aix_shr:
+                      
+          Added -DTAO_INSTANTIATING_TEMPLATES to the link command line.
+
 Thu Jan  2 12:38:55 2003  Johnny Willemsen <jwillemsen@remedy.nl>
 
 	* ace/Makefile.ace: Set the dllflags in Makefile. This makes it
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 569cf0de611..f2aedad5a4d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,29 @@
+Thu Jan  2 13:33:01 2003  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/AV/AV_Core.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp:
+        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp:
+        * orbsvcs/orbsvcs/Notify/EventTypeSeq.h:
+        * orbsvcs/orbsvcs/Notify/Refcountable.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp:
+        * orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp:
+        * tao/Condition.h:
+
+          Added #include to correct AIX build errors.
+
+        * tao/DynamicAny/DynamicAnyC.h:
+        * tao/RTCORBA/RTCORBAC.h:
+
+          Added a second macro TAO_INSTANTIATING_TEMPLATES to the safety
+          check for these files to determine if the AIX compiler is
+          instantiating templates.  If it is instantiating, then we must
+          allow the compiler to #include these files.
+
 Thu Jan  2 10:33:29 2003  Boris S Kolpackov  <boris@isis-server.isis.vanderbilt.edu>
 
 	* tao/PortableServer/ImplRepoC.h:
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
index c1242aed973..4d5c749513f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
@@ -19,6 +19,7 @@
 #include "orbsvcs/AV/AV_export.h"
 
 #include "ace/Singleton.h"
+#include "ace/Unbounded_Set.h"
 
 class TAO_Base_StreamEndPoint;
 class TAO_AV_Connector_Registry;
@@ -30,6 +31,7 @@ class TAO_AV_Transport_Item;
 class TAO_AV_Transport_Factory;
 class TAO_AV_Flow_Protocol_Item;
 class TAO_AV_Flow_Protocol_Factory;
+class ACE_Reactor;
 
 typedef ACE_Unbounded_Set <TAO_FlowSpec_Entry*> TAO_AV_FlowSpecSet;
 typedef ACE_Unbounded_Set_Iterator <TAO_FlowSpec_Entry*> TAO_AV_FlowSpecSetItor;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
index 5d6365c89cf..5aa9d8263fe 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
@@ -20,6 +20,7 @@
 
 #include "CEC_ConsumerControl.h"
 #include "orbsvcs/ESF/ESF_Worker.h"
+#include "ace/Event_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
index b6f42dac61a..91361bd816f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
@@ -22,6 +22,7 @@
 
 #include "orbsvcs/ESF/ESF_Worker.h"
 #include "tao/corba.h"
+#include "ace/Event_Handler.h"
 
 class TAO_CEC_ProxyPullConsumer;
 class TAO_CEC_EventChannel;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
index b2a381592b1..bda347d7776 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
@@ -20,6 +20,7 @@
 
 #include "CEC_SupplierControl.h"
 #include "orbsvcs/ESF/ESF_Worker.h"
+#include "ace/Event_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
index 9eb5d2b8346..44aaeeb01a4 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -10,9 +10,9 @@
 #include "orbsvcs/PortableGroup/PG_conf.h"
 
 #include "tao/Messaging/Messaging.h"
-
 #include "tao/debug.h"
 
+#include "ace/Reactor.h"
 
 ACE_RCSID (LoadBalancing,
            LB_LoadManager,
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
index 25858d62fae..afde13e5ffe 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
@@ -1,6 +1,7 @@
 #include "orbsvcs/Log/EventLogFactory_i.h"
 #include "orbsvcs/Log/LogNotification.h"
 #include "orbsvcs/Log/EventLogNotification.h"
+#include "ace/Auto_Ptr.h"
 
 ACE_RCSID (Log,
            EventLogFactory_i,
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
index 35c28eeb10c..7fcf99d0582 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
@@ -15,6 +15,7 @@
 #include "orbsvcs/Event/Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
+#include "ace/Auto_Ptr.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "orbsvcs/Event/EC_ConsumerAdmin.i"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
index 69fcb6701cd..dea48b705b0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -16,6 +16,7 @@ ACE_RCSID(RT_Notify, TAO_NS_ConsumerAdmin, "$Id$")
 #include "EventChannel.h"
 #include "EventChannelFactory.h"
 #include "Notify_Service.h"
+#include "Properties.h"
 
 TAO_NS_ConsumerAdmin::TAO_NS_ConsumerAdmin (void)
 :TAO_NS_Admin (TAO_NS_Admin::CONSUMER_ADMIN)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
index 5104184f5f6..d5a473ed762 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
@@ -20,8 +20,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "EventType.h"
-
-template<class T> class ACE_Unbounded_Set;
+#include "ace/Unbounded_Set.h"
 
 /**
  * @class TAO_NS_EventTypeSeq
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
index c8d1073a3f5..a703e29f2a4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
@@ -4,6 +4,7 @@
 #include "Destroy_Callback.h"
 
 #include "tao/debug.h"
+#include "ace/Log_Msg.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "Refcountable.inl"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
index 61caa605668..f971a8eb1d9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
@@ -8,6 +8,7 @@
 
 ACE_RCSID(RT_Notify, TAO_NS_StructuredEvent, "$Id$")
 
+#include "../PropertySeq.h"
 #include "../Consumer.h"
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
index 2b4eb07fda4..84ff5247e87 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -16,6 +16,7 @@ ACE_RCSID(RT_Notify, TAO_NS_SupplierAdmin, "$Id$")
 #include "EventChannelFactory.h"
 #include "Notify_Service.h"
 #include "Subscription_Change_Worker.h"
+#include "Properties.h"
 
 TAO_NS_SupplierAdmin::TAO_NS_SupplierAdmin (void)
 :TAO_NS_Admin (TAO_NS_Admin::SUPPLIER_ADMIN)
diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h
index b27ac808011..3ddeccdb133 100644
--- a/TAO/tao/Condition.h
+++ b/TAO/tao/Condition.h
@@ -14,7 +14,7 @@
 #define TAO_CONDITION_H
 #include "ace/pre.h"
 #include "orbconf.h"
-
+#include "ace/Synch_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h
index 1d6e15fa236..d5cfe902931 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.h
+++ b/TAO/tao/DynamicAny/DynamicAnyC.h
@@ -22,7 +22,8 @@
 #ifndef _TAO_IDL_ORIG_DYNAMICANYC_H_
 #define _TAO_IDL_ORIG_DYNAMICANYC_H_
 
-#ifndef TAO_DYNAMICANY_SAFE_INCLUDE
+#if !defined(TAO_DYNAMICANY_SAFE_INCLUDE) && \
+    !defined(TAO_INSTANTIATING_TEMPLATES)
 #error "You should not include DynamicAnyC.h directly, use DynamicAny.h"
 #endif /* !TAO_DYNAMICANY_SAFE_INCLUDE */
 
diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h
index 582ca7b9703..c5316b8b29f 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.h
+++ b/TAO/tao/RTCORBA/RTCORBAC.h
@@ -44,7 +44,8 @@ class TAO_Network_Priority_Mapping_Manager_var;
 class TAO_Network_Priority_Mapping_Manager_out;
 class TAO_Network_Priority_Mapping;
 
-#ifndef TAO_RTCORBA_SAFE_INCLUDE
+#if !defined(TAO_RTCORBA_SAFE_INCLUDE) && \
+    !defined(TAO_INSTANTIATING_TEMPLATES)
 #error "You should not include RTCORBAC.h directly, use RTCORBA.h"
 #endif /* !TAO_RTCORBA_SAFE_INCLUDE */
 
diff --git a/ace/Refcounted_Auto_Ptr.i b/ace/Refcounted_Auto_Ptr.i
index 8fe557b3dde..6a267821364 100644
--- a/ace/Refcounted_Auto_Ptr.i
+++ b/ace/Refcounted_Auto_Ptr.i
@@ -4,6 +4,7 @@
 // Refcounted_Auto_Ptr.i
 
 #include "Synch_T.h"
+#include "ace/Log_Msg.h"
 
 template <class X, class ACE_LOCK> inline int
 ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::count (void) const
diff --git a/bin/aix_shr b/bin/aix_shr
index 5ea5bed40fe..f76770f74a3 100755
--- a/bin/aix_shr
+++ b/bin/aix_shr
@@ -15,7 +15,7 @@ for possible in "$TMPDIR" "$TEMP" "$TMP"; do
 done
 
 ## Send the output to a temporary file and save the return code
-$@ > "$usrtmp/$output" 2>&1
+$@ -DTAO_INSTANTIATING_TEMPLATES > "$usrtmp/$output" 2>&1
 status=$?
 
 ## Print the output to stdout, but filter duplicate symbol warnings from