--- 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 */