ChangeLogTag: Fri Sep 29 02:09:32 2000 Irfan Pyarali <irfan@cs.wustl.edu>

4 files changed, 84 insertions, 4 deletions

diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl
index ec382f8c29c..cd7bd4bcd57 100644
--- a/TAO/tao/PortableServer/PortableServer.pidl
+++ b/TAO/tao/PortableServer/PortableServer.pidl
@@ -17,7 +17,7 @@
 //
 //     tao_idl.exe \
 //          -Ge 1 \
-//          -Wb,export_macro=TAO_Export \
+//          -Wb,export_macro=TAO_PortableServer_Export \
 //          -Wb,export_include="tao/corbafwd.h" \
 //          -Wb,pre_include="ace/pre.h" \
 //          -Wb,post_include="ace/post.h" \
@@ -39,6 +39,18 @@
 //     ObjectId_to_wstring (h) wstring_to_ObjectId (i) ServantBase_var
 //     (j) DynamicImplementation (k) LocalServantBase
 //
+//   Apply patches using the following commands:
+//
+//   patch < diffs\PortableServerC.h.diff
+//   patch < diffs\PortableServerC.i.diff
+//   patch < diffs\PortableServerC.cpp.diff
+
+//   Note: The diffs were generated with these commands:
+//
+//   diff -wub PortableServerC.h PortableServerC.h.mod > diffs\PortableServerC.h.diff
+//   diff -wub PortableServerC.i PortableServerC.i.mod > diffs\PortableServerC.i.diff
+//   diff -wub PortableServerC.cpp PortableServerC.cpp.mod > diffs\PortableServerC.cpp.diff
+//
 // ================================================================
 
 #ifndef _PORTABLESERVER_IDL_
diff --git a/TAO/tao/PortableServer/RTPortableServer.pidl b/TAO/tao/PortableServer/RTPortableServer.pidl
index 6636df063b8..ecd290b30ce 100644
--- a/TAO/tao/PortableServer/RTPortableServer.pidl
+++ b/TAO/tao/PortableServer/RTPortableServer.pidl
@@ -17,14 +17,27 @@
 //
 //     tao_idl.exe \
 //          -Ge 1 \
-//          -Wb,export_macro=TAO_Export \
-//          -Wb,export_include="tao/corbafwd.h" \
+//          -Wb,export_macro=TAO_PortableServer_Export \
 //          -Wb,pre_include="ace/pre.h" \
 //          -Wb,post_include="ace/post.h" \
 //          RTPortableServer.pidl
 //
 //   After the file is generated a patch from the diffs directory must
-//   be applied.  The patch:
+//   be applied.  The patch fixes include file dependencies and adds
+//   TAO_HAS_RT_CORBA directives.  It also makes the inheritance of
+//   RTPortableServer::POA from PortableServer::POA non-virtual.  This
+//   was to make sure that classes casting from PortableServer::POA to
+//   TAO_POA can still do so.
+//
+//   Apply patches using the following commands:
+//
+//   patch < diffs\RTPortableServerC.h.diff
+//   patch < diffs\RTPortableServerC.cpp.diff
+//
+//   Note: The diffs were generated with these commands:
+//
+//   diff -wub RTPortableServerC.h RTPortableServerC.h.mod > diffs\RTPortableServerC.h.diff
+//   diff -wub RTPortableServerC.cpp RTPortableServerC.cpp.mod > diffs\RTPortableServerC.cpp.diff
 //
 // ================================================================
 
diff --git a/TAO/tao/diffs/RTPortableServerC.cpp.diff b/TAO/tao/diffs/RTPortableServerC.cpp.diff
new file mode 100644
index 00000000000..4d78209a4a8
--- /dev/null
+++ b/TAO/tao/diffs/RTPortableServerC.cpp.diff
@@ -0,0 +1,16 @@
+--- RTPortableServerC.cpp	Fri Sep 29 01:51:22 2000
++++ ..\RTPortableServerC.cpp	Fri Sep 29 02:04:44 2000
+@@ -21,6 +21,8 @@
+ 
+ #include "RTPortableServerC.h"
+ 
++#if (TAO_HAS_RT_CORBA == 1)
++
+ #if !defined (__ACE_INLINE__)
+ #include "RTPortableServerC.i"
+ #endif /* !defined INLINE */
+@@ -112,3 +114,4 @@
+   #  pragma instantiate TAO_Object_Manager<RTPortableServer::POA,RTPortableServer::POA_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ 
++#endif /* TAO_HAS_RT_CORBA == 1 */
diff --git a/TAO/tao/diffs/RTPortableServerC.h.diff b/TAO/tao/diffs/RTPortableServerC.h.diff
new file mode 100644
index 00000000000..648465dd84b
--- /dev/null
+++ b/TAO/tao/diffs/RTPortableServerC.h.diff
@@ -0,0 +1,39 @@
+--- RTPortableServerC.h	Fri Sep 29 01:51:22 2000
++++ ..\RTPortableServerC.h	Fri Sep 29 02:04:44 2000
+@@ -23,14 +23,15 @@
+ #define _TAO_IDL_RTPORTABLESERVERC_H_
+ 
+ #include "ace/pre.h"
+-#include "tao/corba.h"
++#include "PortableServerC.h"
++
++#if (TAO_HAS_RT_CORBA == 1)
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+ # pragma once
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
+ 
+-#include "PortableServerC.h"
+-#include "RTCORBAC.h"
++#include "tao/RTCORBAC.h"
+ 
+ #if defined (TAO_EXPORT_MACRO)
+ #undef TAO_EXPORT_MACRO
+@@ -125,7 +126,7 @@
+ #if !defined (_RTPORTABLESERVER_POA_CH_)
+ #define _RTPORTABLESERVER_POA_CH_
+ 
+-class TAO_PortableServer_Export POA: public virtual PortableServer::POA
++class TAO_PortableServer_Export POA: public PortableServer::POA
+   {
+   public:
+   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+@@ -232,6 +233,8 @@
+ #if defined(_MSC_VER) && (_MSC_VER >= 1200)
+ #pragma warning(pop)
+ #endif /* _MSC_VER */
++
++#endif /* TAO_HAS_RT_CORBA */
+ 
+ #include "ace/post.h"
+ #endif /* ifndef */