summaryrefslogtreecommitdiff
path: root/TAO/tao/diffs
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2004-12-08 16:14:45 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2004-12-08 16:14:45 +0000
commit2f6ea75846f9f7a32e87c778868eb3d8b7a91761 (patch)
tree63db5409638da7208823a10682f564bfa3da9f9e /TAO/tao/diffs
parent56b3583c02c2043784063e18bff7b57f808f6184 (diff)
downloadATCD-2f6ea75846f9f7a32e87c778868eb3d8b7a91761.tar.gz
ChangeLogTag: Wed Dec 8 16:13:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/diffs')
-rw-r--r--TAO/tao/diffs/GIOP.diff46
-rw-r--r--TAO/tao/diffs/GIOPS.cpp.diff69
-rw-r--r--TAO/tao/diffs/GIOPS.h.diff89
-rw-r--r--TAO/tao/diffs/GIOPS.i.diff25
-rw-r--r--TAO/tao/diffs/GIOPS_T.cpp.diff43
-rw-r--r--TAO/tao/diffs/GIOPS_T.h.diff71
-rw-r--r--TAO/tao/diffs/GIOPS_T.i.diff25
7 files changed, 0 insertions, 368 deletions
diff --git a/TAO/tao/diffs/GIOP.diff b/TAO/tao/diffs/GIOP.diff
deleted file mode 100644
index 2291bfc3a83..00000000000
--- a/TAO/tao/diffs/GIOP.diff
+++ /dev/null
@@ -1,46 +0,0 @@
---- orig/GIOPC.h 2003-04-27 11:09:17.000000000 -0500
-+++ ./GIOPC.h 2003-04-27 11:15:10.000000000 -0500
-@@ -30,20 +30,17 @@
-
- #ifndef _TAO_IDL_ORIG_GIOPC_H_
- #define _TAO_IDL_ORIG_GIOPC_H_
--
- #include "ace/pre.h"
-
--#include "tao/corba.h"
-+#include "tao/corbafwd.h"
-
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
-
--
--#include "tao/TAO_Export.h"
--
--#include "IOPC.h"
--#include "OctetSeqC.h"
-+#include "tao/IOP_IORC.h"
-+#include "tao/VarOut_T.h"
-+#include "tao/Any_T.h"
-
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
---- orig/GIOPC.cpp 2003-04-27 11:09:17.000000000 -0500
-+++ ./GIOPC.cpp 2003-04-27 11:16:07.000000000 -0500
-@@ -30,16 +30,6 @@
-
-
- #include "GIOPC.h"
--#include "tao/Stub.h"
--#include "tao/Invocation.h"
--#include "tao/PortableInterceptor.h"
--
--#if TAO_HAS_INTERCEPTORS == 1
--#include "tao/RequestInfo_Util.h"
--#include "tao/ClientRequestInfo_i.h"
--#include "tao/ClientInterceptorAdapter.h"
--#endif /* TAO_HAS_INTERCEPTORS == 1 */
--
-
- #if defined (__BORLANDC__)
- #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
diff --git a/TAO/tao/diffs/GIOPS.cpp.diff b/TAO/tao/diffs/GIOPS.cpp.diff
deleted file mode 100644
index b70e55ba4f2..00000000000
--- a/TAO/tao/diffs/GIOPS.cpp.diff
+++ /dev/null
@@ -1,69 +0,0 @@
---- orig/GIOPS.cpp Thu Jan 10 11:45:43 2002
-+++ GIOPS.cpp Tue Sep 12 18:04:48 2000
-@@ -1,52 +1,22 @@
--// -*- C++ -*-
-+/* -*- C++ -*- $Id$ */
- //
--// $Id$
--
--// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
--// TAO and the TAO IDL Compiler have been developed by:
--// Center for Distributed Object Computing
--// Washington University
--// St. Louis, MO
--// USA
--// http://www.cs.wustl.edu/~schmidt/doc-center.html
--// and
--// Distributed Object Computing Laboratory
--// University of California at Irvine
--// Irvine, CA
--// USA
--// http://doc.ece.uci.edu/
-+// $Id$
- //
--// Information about TAO is available at:
--// http://www.cs.wustl.edu/~schmidt/TAO.html
--
--#ifndef _TAO_IDL_GIOPS_CPP_
--#define _TAO_IDL_GIOPS_CPP_
-+// ================================================================
-+//
-+// = LIBRARY
-+// TAO
-+//
-+// = FILENAME
-+// GIOPS.cpp
-+//
-+// = DESCRIPTION
-+// Generated from GIOP.pidl
-+//
-+// ================================================================
-
- #include "GIOPS.h"
-
--#include "tao/PortableServer/Object_Adapter.h"
--#include "tao/PortableServer/Operation_Table.h"
--#include "tao/TAO_Server_Request.h"
--#include "tao/ORB_Core.h"
--#include "tao/Stub.h"
--#include "tao/IFR_Client_Adapter.h"
--#include "tao/PortableInterceptor.h"
--
--#if TAO_HAS_INTERCEPTORS == 1
--#include "tao/RequestInfo_Util.h"
--#include "tao/PICurrent.h"
--#include "tao/PortableServer/ServerRequestInfo.h"
--#include "tao/PortableServer/ServerInterceptorAdapter.h"
--#endif /* TAO_HAS_INTERCEPTORS == 1 */
--
--#include "ace/Dynamic_Service.h"
--#if defined (__BORLANDC__)
--#pragma option -w-rvl -w-rch -w-ccc -w-aus
--#endif /* __BORLANDC__ */
--
- #if !defined (__ACE_INLINE__)
- #include "GIOPS.i"
- #endif /* !defined INLINE */
--
--
--#endif /* ifndef */
diff --git a/TAO/tao/diffs/GIOPS.h.diff b/TAO/tao/diffs/GIOPS.h.diff
deleted file mode 100644
index 4dac3131285..00000000000
--- a/TAO/tao/diffs/GIOPS.h.diff
+++ /dev/null
@@ -1,89 +0,0 @@
---- orig/GIOPS.h Thu Jan 10 11:45:43 2002
-+++ GIOPS.h Fri Dec 15 14:06:47 2000
-@@ -1,29 +1,20 @@
--// -*- C++ -*-
--//
--// $Id$
--
--// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
--// TAO and the TAO IDL Compiler have been developed by:
--// Center for Distributed Object Computing
--// Washington University
--// St. Louis, MO
--// USA
--// http://www.cs.wustl.edu/~schmidt/doc-center.html
--// and
--// Distributed Object Computing Laboratory
--// University of California at Irvine
--// Irvine, CA
--// USA
--// http://doc.ece.uci.edu/
--//
--// Information about TAO is available at:
--// http://www.cs.wustl.edu/~schmidt/TAO.html
-+/* -*- C++ -*- $Id$ */
-+//=============================================================================
-+/**
-+ * @file GIOPS.h
-+ *
-+ * $Id$
-+ *
-+ * Generated from GIOP.pidl
-+ * The file is almost empty and only present to keep other IDL files
-+ * that include GIOP.pidl happy.
-+ *
-+ */
-+//=============================================================================
-
--#ifndef _TAO_IDL_GIOPS_H_
--#define _TAO_IDL_GIOPS_H_
-+#ifndef TAO_IDL_GIOP1_2S_H
-+#define TAO_IDL_GIOP1_2S_H
-
--#include "ace/pre.h"
--#include "IOPS.h"
- #include "GIOPC.h"
-
-
-@@ -31,40 +22,10 @@
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
-
--#include "tao/PortableServer/PortableServer.h"
--#include "tao/PortableServer/Servant_Base.h"
--#include "tao/PortableServer/Collocated_Object.h"
--#include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h"
--#include "tao/PortableServer/Direct_Object_Proxy_Impl.h"
--#if defined(_MSC_VER)
--#if (_MSC_VER >= 1200)
--#pragma warning(push)
--#endif /* _MSC_VER >= 1200 */
--#pragma warning(disable:4250)
--#endif /* _MSC_VER */
--
--#if defined (__BORLANDC__)
--#pragma option push -w-rvl -w-rch -w-ccc -w-inl
--#endif /* __BORLANDC__ */
--
--TAO_NAMESPACE POA_GIOP
--{
--}
--TAO_NAMESPACE_CLOSE // module GIOP
--
--#include "GIOPS_T.h"
-+#include "tao/GIOPS_T.h"
-
- #if defined (__ACE_INLINE__)
- #include "GIOPS.i"
- #endif /* defined INLINE */
-
--#if defined(_MSC_VER) && (_MSC_VER >= 1200)
--#pragma warning(pop)
--#endif /* _MSC_VER */
--
--#if defined (__BORLANDC__)
--#pragma option pop
--#endif /* __BORLANDC__ */
--
--#include "ace/post.h"
- #endif /* ifndef */
diff --git a/TAO/tao/diffs/GIOPS.i.diff b/TAO/tao/diffs/GIOPS.i.diff
deleted file mode 100644
index b97701de0ac..00000000000
--- a/TAO/tao/diffs/GIOPS.i.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- orig/GIOPS.i Thu Jan 10 11:45:43 2002
-+++ GIOPS.i Tue Sep 12 18:04:48 2000
-@@ -1,21 +1 @@
--// -*- C++ -*-
--//
--// $Id$
--
--// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
--// TAO and the TAO IDL Compiler have been developed by:
--// Center for Distributed Object Computing
--// Washington University
--// St. Louis, MO
--// USA
--// http://www.cs.wustl.edu/~schmidt/doc-center.html
--// and
--// Distributed Object Computing Laboratory
--// University of California at Irvine
--// Irvine, CA
--// USA
--// http://doc.ece.uci.edu/
--//
--// Information about TAO is available at:
--// http://www.cs.wustl.edu/~schmidt/TAO.html
--
-+/* -*- C++ -*- $Id$ */
diff --git a/TAO/tao/diffs/GIOPS_T.cpp.diff b/TAO/tao/diffs/GIOPS_T.cpp.diff
deleted file mode 100644
index 5eadc43f56a..00000000000
--- a/TAO/tao/diffs/GIOPS_T.cpp.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- orig/GIOPS_T.cpp Thu Jan 10 11:45:43 2002
-+++ GIOPS_T.cpp Tue Sep 12 18:04:48 2000
-@@ -1,26 +1,19 @@
--// -*- C++ -*-
-+/* -*- C++ -*- $Id$ */
-+// ================================================================
- //
--// $Id$
--
--// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
--// TAO and the TAO IDL Compiler have been developed by:
--// Center for Distributed Object Computing
--// Washington University
--// St. Louis, MO
--// USA
--// http://www.cs.wustl.edu/~schmidt/doc-center.html
--// and
--// Distributed Object Computing Laboratory
--// University of California at Irvine
--// Irvine, CA
--// USA
--// http://doc.ece.uci.edu/
-+// = LIBRARY
-+// TAO
- //
--// Information about TAO is available at:
--// http://www.cs.wustl.edu/~schmidt/TAO.html
--
--#ifndef _TAO_IDL_GIOPS_T_CPP_
--#define _TAO_IDL_GIOPS_T_CPP_
-+// = FILENAME
-+// GIOPS_T.h
-+//
-+// = DESCRIPTION
-+// Generated from GIOP.pidl
-+// The file is almost empty and only present to keep other IDL files
-+// that include GIOP.pidl happy.
-+// ================================================================
-+#ifndef TAO_IDL_GIOP1_2S_T_CPP
-+#define TAO_IDL_GIOP1_2S_T_CPP
-
- #include "GIOPS_T.h"
-
diff --git a/TAO/tao/diffs/GIOPS_T.h.diff b/TAO/tao/diffs/GIOPS_T.h.diff
deleted file mode 100644
index d7e1925657f..00000000000
--- a/TAO/tao/diffs/GIOPS_T.h.diff
+++ /dev/null
@@ -1,71 +0,0 @@
---- orig/GIOPS_T.h Thu Jan 10 11:45:43 2002
-+++ GIOPS_T.h Fri Dec 15 14:06:47 2000
-@@ -1,41 +1,20 @@
--// -*- C++ -*-
--//
--// $Id$
--
--// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
--// TAO and the TAO IDL Compiler have been developed by:
--// Center for Distributed Object Computing
--// Washington University
--// St. Louis, MO
--// USA
--// http://www.cs.wustl.edu/~schmidt/doc-center.html
--// and
--// Distributed Object Computing Laboratory
--// University of California at Irvine
--// Irvine, CA
--// USA
--// http://doc.ece.uci.edu/
--//
--// Information about TAO is available at:
--// http://www.cs.wustl.edu/~schmidt/TAO.html
--
--#ifndef _TAO_IDL_GIOPS_T_H_
--#define _TAO_IDL_GIOPS_T_H_
--
--#include "ace/pre.h"
--#if defined(_MSC_VER)
--#if (_MSC_VER >= 1200)
--#pragma warning(push)
--#endif /* _MSC_VER >= 1200 */
--#pragma warning(disable:4250)
--#endif /* _MSC_VER */
--
--#if defined (ACE_HAS_USING_KEYWORD)
--TAO_NAMESPACE POA_GIOP
--{
--}
--TAO_NAMESPACE_CLOSE // module GIOP
--#endif /* ACE_HAS_USING_KEYWORD */
-+/* -*- C++ -*- $Id$ */
-+//=============================================================================
-+/**
-+ * @file GIOPS_T.h
-+ *
-+ * $Id$
-+ *
-+ * Generated from GIOP.pidl
-+ * The file is almost empty and only present to keep other IDL files
-+ * that include GIOP.pidl happy.
-+ *
-+ */
-+//=============================================================================
-+
-+#ifndef TAO_IDL_GIOP1_2S_T_H
-+#define TAO_IDL_GIOP1_2S_T_H
-+
-
- #if defined (__ACE_INLINE__)
- #include "GIOPS_T.i"
-@@ -51,9 +30,4 @@
- #pragma implementation ("GIOPS_T.cpp")
- #endif /* defined REQUIRED PRAGMA */
-
--#if defined(_MSC_VER) && (_MSC_VER >= 1200)
--#pragma warning(pop)
--#endif /* _MSC_VER */
--
--#include "ace/post.h"
- #endif /* ifndef */
diff --git a/TAO/tao/diffs/GIOPS_T.i.diff b/TAO/tao/diffs/GIOPS_T.i.diff
deleted file mode 100644
index 27f779ada9e..00000000000
--- a/TAO/tao/diffs/GIOPS_T.i.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- orig/GIOPS_T.i Thu Jan 10 11:45:43 2002
-+++ GIOPS_T.i Tue Sep 12 18:04:48 2000
-@@ -1,21 +1 @@
--// -*- C++ -*-
--//
--// $Id$
--
--// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
--// TAO and the TAO IDL Compiler have been developed by:
--// Center for Distributed Object Computing
--// Washington University
--// St. Louis, MO
--// USA
--// http://www.cs.wustl.edu/~schmidt/doc-center.html
--// and
--// Distributed Object Computing Laboratory
--// University of California at Irvine
--// Irvine, CA
--// USA
--// http://doc.ece.uci.edu/
--//
--// Information about TAO is available at:
--// http://www.cs.wustl.edu/~schmidt/TAO.html
--
-+/* -*- C++ -*- $Id$ */