ChangeLogTag:Mon Nov 3 21:33:42 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

4 files changed, 22 insertions, 167 deletions

diff --git a/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff b/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff
new file mode 100644
index 00000000000..23128eda6e1
--- /dev/null
+++ b/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff
@@ -0,0 +1,22 @@
+--- orig/BiDirPolicyC.h	2003-11-03 21:04:56.000000000 -0600
++++ BiDirPolicyC.h	2003-11-03 21:20:15.000000000 -0600
+@@ -48,7 +48,7 @@
+ #include "tao/Object.h"
+ #include "tao/Objref_VarOut_T.h"
+ 
+-#include "PolicyC.h"
++#include "tao/PolicyC.h"
+ 
+ #if defined (TAO_EXPORT_MACRO)
+ #undef TAO_EXPORT_MACRO
+--- orig/BiDirPolicyC.cpp	2003-11-03 21:04:10.000000000 -0600
++++ BiDirPolicyC.cpp	2003-11-03 21:19:02.000000000 -0600
+@@ -29,7 +29,7 @@
+ // be/be_codegen.cpp:302
+ 
+ 
+-#include "BiDirPolicyC.h"
++#include "BiDirGIOP.h"
+ #include "ace/OS_NS_string.h"
+ 
+ #if defined (__BORLANDC__)
diff --git a/TAO/tao/BiDir_GIOP/diffs/BiDirPolicyC.cpp.diff b/TAO/tao/BiDir_GIOP/diffs/BiDirPolicyC.cpp.diff
deleted file mode 100644
index b16bf69740c..00000000000
--- a/TAO/tao/BiDir_GIOP/diffs/BiDirPolicyC.cpp.diff
+++ /dev/null
@@ -1,77 +0,0 @@
---- orig/BiDirPolicyC.cpp	Wed Apr 25 00:30:48 2001
-+++ BiDirPolicyC.cpp	Tue Apr 24 13:44:43 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -19,14 +19,8 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#include "BiDirPolicyC.h"
--
--#include "tao/Stub.h"
--#include "tao/Invocation.h"
--#include "tao/ClientRequestInfo.h"
--#if TAO_HAS_INTERCEPTORS == 1
--#include "tao/RequestInfo_Util.h"
--#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-+#include "BiDirGIOP.h"
-+#include "tao/Typecode.h"
- 
- #if defined (__BORLANDC__)
- #pragma option -w-rvl -w-rch -w-ccc -w-aus
-@@ -89,49 +83,6 @@
- TAO_NAMESPACE_BEGIN (BiDirPolicy)
- TAO_NAMESPACE_DEFINE (const CORBA::ULong, BIDIRECTIONAL_POLICY_TYPE, 37U)
- TAO_NAMESPACE_END
--BiDirPolicy::BidirectionalPolicy_ptr
--tao_BiDirPolicy_BidirectionalPolicy_duplicate (
--    BiDirPolicy::BidirectionalPolicy_ptr p
--  )
--{
--  return BiDirPolicy::BidirectionalPolicy::_duplicate (p);
--}
--
--void
--tao_BiDirPolicy_BidirectionalPolicy_release (
--    BiDirPolicy::BidirectionalPolicy_ptr p
--  )
--{
--  CORBA::release (p);
--}
--
--BiDirPolicy::BidirectionalPolicy_ptr
--tao_BiDirPolicy_BidirectionalPolicy_nil (
--    void
--  )
--{
--  return BiDirPolicy::BidirectionalPolicy::_nil ();
--}
--
--BiDirPolicy::BidirectionalPolicy_ptr
--tao_BiDirPolicy_BidirectionalPolicy_narrow (
--    CORBA::Object *p,
--    CORBA::Environment &ACE_TRY_ENV
--  )
--{
--  return BiDirPolicy::BidirectionalPolicy::_narrow (p, ACE_TRY_ENV);
--}
--
--CORBA::Object *
--tao_BiDirPolicy_BidirectionalPolicy_upcast (
--    void *src
--  )
--{
--  BiDirPolicy::BidirectionalPolicy **tmp =
--    ACE_static_cast (BiDirPolicy::BidirectionalPolicy **, src);
--  return *tmp;
--}
--
- // *************************************************************
- // Operations for class BiDirPolicy::BidirectionalPolicy_var
- // *************************************************************
diff --git a/TAO/tao/BiDir_GIOP/diffs/BiDirPolicyC.h.diff b/TAO/tao/BiDir_GIOP/diffs/BiDirPolicyC.h.diff
deleted file mode 100644
index 725432afbad..00000000000
--- a/TAO/tao/BiDir_GIOP/diffs/BiDirPolicyC.h.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- orig/BiDirPolicyC.h	Wed Apr 25 00:30:48 2001
-+++ BiDirPolicyC.h	Tue Apr 24 13:44:43 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -22,14 +22,17 @@
- #ifndef _TAO_IDL_ORIG_BIDIRPOLICYC_H_
- #define _TAO_IDL_ORIG_BIDIRPOLICYC_H_
- 
-+#ifndef TAO_BIDIRGIOP_SAFE_INCLUDE
-+#error "You should not include BiDirPolicyC.h directly, use BiDirGIOP.h"
-+#endif /* !TAO_BIDIRGIOP_SAFE_INCLUDE */
-+
- #include "ace/pre.h"
--#include "tao/corba.h"
-+#include "bidirgiop_export.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
--#include "bidirgiop_export.h"
- #include "tao/PolicyC.h"
- 
- #if defined (TAO_EXPORT_MACRO)
diff --git a/TAO/tao/BiDir_GIOP/diffs/BiDirPolicyC.i.diff b/TAO/tao/BiDir_GIOP/diffs/BiDirPolicyC.i.diff
deleted file mode 100644
index a11f5daea38..00000000000
--- a/TAO/tao/BiDir_GIOP/diffs/BiDirPolicyC.i.diff
+++ /dev/null
@@ -1,60 +0,0 @@
---- orig/BiDirPolicyC.i	Wed Apr 25 00:30:48 2001
-+++ BiDirPolicyC.i	Tue Apr 24 13:44:43 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -22,6 +22,49 @@
- 
- #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY___CI_)
- #define _BIDIRPOLICY_BIDIRECTIONALPOLICY___CI_
-+
-+ACE_INLINE BiDirPolicy::BidirectionalPolicy_ptr
-+tao_BiDirPolicy_BidirectionalPolicy_duplicate (
-+    BiDirPolicy::BidirectionalPolicy_ptr p
-+  )
-+{
-+  return BiDirPolicy::BidirectionalPolicy::_duplicate (p);
-+}
-+
-+ACE_INLINE void
-+tao_BiDirPolicy_BidirectionalPolicy_release (
-+    BiDirPolicy::BidirectionalPolicy_ptr p
-+  )
-+{
-+  CORBA::release (p);
-+}
-+
-+ACE_INLINE BiDirPolicy::BidirectionalPolicy_ptr
-+tao_BiDirPolicy_BidirectionalPolicy_nil (
-+    void
-+  )
-+{
-+  return BiDirPolicy::BidirectionalPolicy::_nil ();
-+}
-+
-+ACE_INLINE BiDirPolicy::BidirectionalPolicy_ptr
-+tao_BiDirPolicy_BidirectionalPolicy_narrow (
-+    CORBA::Object *p,
-+    CORBA::Environment &ACE_TRY_ENV
-+  )
-+{
-+  return BiDirPolicy::BidirectionalPolicy::_narrow (p, ACE_TRY_ENV);
-+}
-+
-+ACE_INLINE CORBA::Object *
-+tao_BiDirPolicy_BidirectionalPolicy_upcast (
-+    void *src
-+  )
-+{
-+  BiDirPolicy::BidirectionalPolicy **tmp =
-+    ACE_static_cast (BiDirPolicy::BidirectionalPolicy **, src);
-+  return *tmp;
-+}
- 
- 
- #endif /* end #if !defined */