summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2004-09-08 10:07:13 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2004-09-08 10:07:13 +0000
commita9f2c6131d24ef4f34faa3602a145480cca5fa7c (patch)
tree85a466f588f781afa764672e25271660f8e71470
parentc3f2c9e019e8c8a96ee236bd53509249ec96c185 (diff)
downloadATCD-a9f2c6131d24ef4f34faa3602a145480cca5fa7c.tar.gz
ChangeLogTag: Wed Sep 8 08:59:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/tao/PortableServer/diffs/PS_Forward.diff26
-rw-r--r--TAO/tao/PortableServer/diffs/ServantLocator.diff11
2 files changed, 37 insertions, 0 deletions
diff --git a/TAO/tao/PortableServer/diffs/PS_Forward.diff b/TAO/tao/PortableServer/diffs/PS_Forward.diff
new file mode 100644
index 00000000000..f766a1306a2
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/PS_Forward.diff
@@ -0,0 +1,26 @@
+--- orig/PS_ForwardC.h 2004-09-08 11:42:25.290763800 +0200
++++ PS_ForwardC.h 2004-09-08 11:49:23.702410200 +0200
+@@ -70,11 +70,23 @@
+ #pragma option push -w-rvl -w-rch -w-ccc -w-inl
+ #endif /* __BORLANDC__ */
+
++class TAO_ServantBase;
++class TAO_ServantBase_var;
++class TAO_RefCountServantBase;
++class TAO_Local_ServantBase;
++class TAO_POA;
++
+ // TAO_IDL - Generated from
+ // be\be_visitor_module/module_ch.cpp:48
+
+ namespace PortableServer
+ {
++ typedef TAO_ServantBase ServantBase;
++ typedef TAO_ServantBase_var ServantBase_var;
++ typedef TAO_RefCountServantBase RefCountServantBase;
++ typedef ServantBase *Servant;
++
++ typedef TAO_Local_ServantBase LocalServantBase;
+
+ // TAO_IDL - Generated from
+ // be\be_visitor_typedef/typedef_ch.cpp:435
diff --git a/TAO/tao/PortableServer/diffs/ServantLocator.diff b/TAO/tao/PortableServer/diffs/ServantLocator.diff
new file mode 100644
index 00000000000..559e2fe9872
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/ServantLocator.diff
@@ -0,0 +1,11 @@
+--- orig/ServantLocatorC.h 2004-09-08 11:28:02.199699800 +0200
++++ ServantLocatorC.h 2004-09-08 11:31:47.083066200 +0200
+@@ -141,6 +141,8 @@
+ : public virtual ::PortableServer::ServantManager
+ {
+ public:
++ typedef void *Cookie;
++
+ typedef ServantLocator_ptr _ptr_type;
+ typedef ServantLocator_var _var_type;
+