ChangeLogTag: Tue Sep 12 18:01:52 2000 Balachandran Natarajan <bala@cs.wustl.edu>

8 files changed, 163 insertions, 0 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index b24ae8b0934..3313fece024 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,15 @@
+Tue Sep 12 18:01:52 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* tao/GIOPS_T.i:
+	* tao/GIOPS_T.h:
+	* tao/GIOPS_T.cpp:
+	* tao/GIOPS.h:
+	* tao/GIOPS.cpp:
+	* tao/GIOPS.h: Added these dummy files so that idl files that
+	  include GIOP.pidl would be happy.
+
+	* tao/GIOP.pidl: Moved the GIOP1_2.pidl as GIOP.pidl.
+
 Tue Sep 12 15:53:30 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * orbsvcs/IFR_Service/Makefile.IFR_Service:
diff --git a/TAO/tao/GIOP.pidl b/TAO/tao/GIOP.pidl
new file mode 100644
index 00000000000..46335776941
--- /dev/null
+++ b/TAO/tao/GIOP.pidl
@@ -0,0 +1,38 @@
+//$Id$
+// ================================================================
+//
+// = LIBRARY
+//   TAO
+//
+// = FILENAME
+//   GIOP1_2.pidl
+//
+// = DESCRIPTION
+//   Some new data types included for GIOP 1.2
+// ================================================================
+#pragma prefix "omg.org"
+module GIOP 
+{
+  typedef short AddressingDisposition;
+  const short KeyAddr = 0;
+  const short ProfileAddr = 1;
+  const short ReferenceAddr = 2;
+
+  struct Version
+  {
+    octet major;
+    octet minor;
+  };
+  struct IORAddressingInfo 
+  {
+    unsigned long selected_profile_index;
+    IOP::IOR ior;
+  };
+
+  union TargetAddress switch (AddressingDisposition) 
+  {
+    case KeyAddr: sequence <octet> object_key;
+    case ProfileAddr: IOP::TaggedProfile profile;
+    case ReferenceAddr: IORAddressingInfo ior;
+  };
+};
diff --git a/TAO/tao/GIOPS.cpp b/TAO/tao/GIOPS.cpp
new file mode 100644
index 00000000000..5839715167a
--- /dev/null
+++ b/TAO/tao/GIOPS.cpp
@@ -0,0 +1,22 @@
+/* -*- C++ -*- $Id$ */
+//
+// $Id$
+//
+// ================================================================
+//
+// = LIBRARY
+//   TAO
+//
+// = FILENAME
+//   GIOPS.cpp
+//
+// = DESCRIPTION
+//   Generated from GIOP.pidl
+//
+// ================================================================
+
+#include "GIOPS.h"
+
+#if !defined (__ACE_INLINE__)
+#include "GIOPS.i"
+#endif /* !defined INLINE */
diff --git a/TAO/tao/GIOPS.h b/TAO/tao/GIOPS.h
new file mode 100644
index 00000000000..306402d67d4
--- /dev/null
+++ b/TAO/tao/GIOPS.h
@@ -0,0 +1,31 @@
+/* -*- C++ -*- $Id$ */
+// ================================================================
+//
+// = LIBRARY
+//   TAO
+//
+// = FILENAME
+//   GIOPS.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_H
+#define TAO_IDL_GIOP1_2S_H
+
+#include "GIOPC.h"
+
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/GIOPS_T.h"
+
+#if defined (__ACE_INLINE__)
+#include "GIOPS.i"
+#endif /* defined INLINE */
+
+#endif /* ifndef */
diff --git a/TAO/tao/GIOPS.i b/TAO/tao/GIOPS.i
new file mode 100644
index 00000000000..47159b11f78
--- /dev/null
+++ b/TAO/tao/GIOPS.i
@@ -0,0 +1 @@
+/* -*- C++ -*- $Id$ */
diff --git a/TAO/tao/GIOPS_T.cpp b/TAO/tao/GIOPS_T.cpp
new file mode 100644
index 00000000000..5c82fa9f66b
--- /dev/null
+++ b/TAO/tao/GIOPS_T.cpp
@@ -0,0 +1,25 @@
+/* -*- C++ -*- $Id$ */
+// ================================================================
+//
+// = LIBRARY
+//   TAO
+//
+// = 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"
+
+#if !defined (__ACE_INLINE__)
+#include "GIOPS_T.i"
+#endif /* !defined INLINE */
+
+
+#endif /* ifndef */
diff --git a/TAO/tao/GIOPS_T.h b/TAO/tao/GIOPS_T.h
new file mode 100644
index 00000000000..57ff5306e8e
--- /dev/null
+++ b/TAO/tao/GIOPS_T.h
@@ -0,0 +1,33 @@
+/* -*- C++ -*- $Id$ */
+// ================================================================
+//
+// = LIBRARY
+//   TAO
+//
+// = 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_H
+#define TAO_IDL_GIOP1_2S_T_H
+
+
+#if defined (__ACE_INLINE__)
+#include "GIOPS_T.i"
+#endif /* defined INLINE */
+
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "GIOPS_T.cpp"
+#endif /* defined REQUIRED SOURCE */
+
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("GIOPS_T.cpp")
+#endif /* defined REQUIRED PRAGMA */
+
+#endif /* ifndef */
diff --git a/TAO/tao/GIOPS_T.i b/TAO/tao/GIOPS_T.i
new file mode 100644
index 00000000000..47159b11f78
--- /dev/null
+++ b/TAO/tao/GIOPS_T.i
@@ -0,0 +1 @@
+/* -*- C++ -*- $Id$ */