ChangeLogTag:Sun Nov 28 17:41:37 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>

13 files changed, 104 insertions, 52 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ad7f597c58c..7b3c3ece012 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,31 @@
+Sun Nov 28 17:41:37 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tao/IORInterceptor/IORInterceptor.h:	
+
+	  A new header file which can be included by trhe applications to
+	  pull in IORInterceptor symbols even in static mode. 
+	
+	* tao/IORInterceptor/IORInterceptorC.cpp:
+	* tao/IORInterceptor/IORInterceptorC.h:
+
+	  Regenerated the files with our standard  trick to prevent
+	  applications including this file directly. 
+	
+	* tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp:
+	* tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h:
+	* tao/IORInterceptor/IORInterceptor_Adapter_Impl.h:
+	* tao/IORInterceptor/IORInterceptor_List.h:
+
+	  Reduced inter-header dependancies. 
+	
+ 	* orbsvcs/examples/ORT/Server_IORInterceptor.h:
+	* orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h:
+	* tests/ORT/ORT_test_IORInterceptor.h:
+	* tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h:
+	* tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h:
+
+	  #included IORInterceptor.h
+
 Sun Nov 28 15:14:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
 
 	* examples/Simple/grid/Grid_Client_i.cpp:
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
index e39e49ddb32..659ee3ea336 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
@@ -6,7 +6,7 @@
 #define SERVER_IORINTERCEPTOR_H
 
 #include "GatewayC.h"
-#include "tao/IORInterceptor/IORInterceptorC.h"
+#include "tao/IORInterceptor/IORInterceptor.h"
 #include "tao/LocalObject.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index 7252318027a..c17363ad9d0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -21,7 +21,7 @@
 
 #include "orbsvcs/CosLoadBalancingC.h"
 #include "tao/LocalObject.h"
-#include "tao/IORInterceptor/IORInterceptorC.h"
+#include "tao/IORInterceptor/IORInterceptor.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
diff --git a/TAO/tao/IORInterceptor/IORInterceptor.h b/TAO/tao/IORInterceptor/IORInterceptor.h
new file mode 100644
index 00000000000..802055759e9
--- /dev/null
+++ b/TAO/tao/IORInterceptor/IORInterceptor.h
@@ -0,0 +1,23 @@
+/* -*- C++ -*- */
+
+//=============================================================================
+/**
+ *  @file    IORInterceptor.h
+ *
+ *  $Id$
+ *
+ *  @author Bala Natarajan <bala@dre.vanderbilt.edu>
+ */
+//=============================================================================
+#ifndef TAO_IORINTERCEPTOR_IORINTERCEPTOR_H
+#define TAO_IORINTERCEPTOR_IORINTERCEPTOR_H
+#include /**/ "ace/pre.h"
+
+#include "tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "ace/post.h"
+#endif /*TAO_IORINTERCEPTOR_IORINTERCEPTOR_H*/
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.cpp b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
index be51db89f4b..207b9ff5945 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:303
+// be/be_codegen.cpp:301
 
 
-#include "IORInterceptorC.h"
+#include "IORInterceptor.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -42,7 +42,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:64
+// be/be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -51,7 +51,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
+// be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::IORInterceptor.
 
@@ -90,12 +90,6 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*PortableInterceptor__TAO_IORInterceptor_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 PortableInterceptor::IORInterceptor::IORInterceptor (void)
 {}
 
@@ -192,7 +186,7 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1628
+// be/be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h
index e7e07e8f806..617a426dc43 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.h
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.h
@@ -26,13 +26,16 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:153
+// be/be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_IORINTERCEPTORC_H_
 #define _TAO_IDL_ORIG_IORINTERCEPTORC_H_
 
 #include /**/ "ace/pre.h"
 
+#ifndef TAO_IORINTERCEPTOR_SAFE_INCLUDE
+#error "You should not include IORInterceptorC.h directly, use IORInterceptor.h"
+#endif /* !TAO_IORINTERCEPTOR_SAFE_INCLUDE */
 
 #include "ace/config-all.h"
 
@@ -42,6 +45,7 @@
 
 #include "iorinterceptor_export.h"
 #include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
@@ -63,9 +67,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -74,7 +76,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63
+// be/be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
@@ -85,13 +87,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+// be/be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
 
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:613
+  // be/be_interface.cpp:603
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_
@@ -114,7 +116,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // be/be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_
@@ -147,7 +149,7 @@ namespace PortableInterceptor
 
 
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void establish_components (
         ::PortableInterceptor::IORInfo_ptr info
@@ -158,7 +160,7 @@ namespace PortableInterceptor
       )) = 0;
 
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void components_established (
         ::PortableInterceptor::IORInfo_ptr info
@@ -169,7 +171,7 @@ namespace PortableInterceptor
       )) = 0;
 
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void adapter_manager_state_changed (
         ::PortableInterceptor::AdapterManagerId id,
@@ -181,7 +183,7 @@ namespace PortableInterceptor
       )) = 0;
 
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual void adapter_state_changed (
         const ::PortableInterceptor::ObjectReferenceTemplateSeq & templates,
@@ -193,7 +195,7 @@ namespace PortableInterceptor
       )) = 0;
 
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:208
+    // be/be_visitor_interface/interface_ch.cpp:208
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -219,12 +221,12 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66
+// be/be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:59
+// be/be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -253,13 +255,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:958
+// be/be_codegen.cpp:958
 
 #if defined (__ACE_INLINE__)
 #include "IORInterceptorC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
index 39bf2af372e..986cc031d01 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
 #include "IORInterceptor_Adapter_Factory_Impl.h"
+#include "IORInterceptor_Adapter_Impl.h"
+
 #include "tao/ORB_Core.h"
 
 ACE_RCSID (IORInterceptor,
@@ -11,16 +13,16 @@ TAO_IORInterceptor_Adapter_Factory_Impl::~TAO_IORInterceptor_Adapter_Factory_Imp
 {
 }
 
-TAO_IORInterceptor_Adapter * TAO_IORInterceptor_Adapter_Factory_Impl::create (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-  )
+TAO_IORInterceptor_Adapter *
+TAO_IORInterceptor_Adapter_Factory_Impl::create (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_IORInterceptor_Adapter_Impl * new_iorinterceptor_adapter = 0;
-  ACE_NEW_RETURN (new_iorinterceptor_adapter,
-                  TAO_IORInterceptor_Adapter_Impl,
-                  0);
-  return new_iorinterceptor_adapter;
+  TAO_IORInterceptor_Adapter_Impl *nia = 0;
+  ACE_NEW_THROW_EX (nia,
+                    TAO_IORInterceptor_Adapter_Impl (),
+                    CORBA::NO_MEMORY ());
+
+  return nia;
 }
 
 
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
index 33cb782f913..4b11bc97d9c 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
@@ -16,17 +16,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "IORInterceptorC.h"
+#include "iorinterceptor_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "iorinterceptor_export.h"
-#include "tao/IORInterceptor_Adapter_Factory.h"
-#include "tao/IORInterceptor/IORInterceptor_Adapter_Impl.h"
 #include "ace/Service_Config.h"
-#include "IORInterceptor_List.h"
+#include "tao/IORInterceptor_Adapter_Factory.h"
+
+
+class TAO_IORInterceptor_Adapter;
 
 /**
  * @class TAO_IORInterceptor_Adapter_Factory_Impl
@@ -70,6 +69,10 @@ TAO_Requires_IORInterceptor_Initializer =
 
 #endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
 
+#define TAO_IORINTERCEPTOR_SAFE_INCLUDE
+#include "tao/IORInterceptor/IORInterceptorC.h"
+#undef TAO_IORINTERCEPTOR_SAFE_INCLUDE
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_IORINTERCEPTOR_ADAPTER_FACTORY_IMPL_H */
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
index 8a4a7f82b6f..4fb7ae5e458 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
@@ -16,16 +16,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "IORInterceptorC.h"
+#include "iorinterceptor_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "iorinterceptor_export.h"
+
 #include "tao/IORInterceptor_Adapter.h"
-#include "ace/Service_Config.h"
-#include "IORInterceptor_List.h"
+#include "tao/IORInterceptor/IORInterceptor_List.h"
+#include "tao/IORInterceptor/IORInterceptor.h"
 
 class TAO_POA;
 
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_List.h b/TAO/tao/IORInterceptor/IORInterceptor_List.h
index 05bd4f9d3c5..b1761f599a9 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_List.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_List.h
@@ -21,10 +21,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "IORInterceptorC.h"
-
 #include "tao/Interceptor_List.h"
 #include "tao/PortableServer/ORT_Adapter.h"
+#include "tao/IORInterceptor/IORInterceptor.h"
+
 
 /**
  * @class TAO_IORInterceptor_List
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.h b/TAO/tests/ORT/ORT_test_IORInterceptor.h
index 5795aa51e56..8a5b068bf7d 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.h
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/IORInterceptor/IORInterceptorC.h"
+#include "tao/IORInterceptor/IORInterceptor.h"
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
 
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
index 1709ef20e4e..16e97a00ad7 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/IORInterceptor/IORInterceptorC.h"
+#include "tao/IORInterceptor/IORInterceptor.h"
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
 
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
index 8e2ab5a206f..cb8ce431dd2 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/IORInterceptor/IORInterceptorC.h"
+#include "tao/IORInterceptor/IORInterceptor.h"
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"