ChangeLogTag: Wed Mar 12 09:49:00 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

1 files changed, 11 insertions, 16 deletions

diff --git a/TAO/tao/orb.idl b/TAO/tao/orb.idl
index 65714ddb943..5f6f56d77dd 100644
--- a/TAO/tao/orb.idl
+++ b/TAO/tao/orb.idl
@@ -8,6 +8,7 @@
 #define TAO_ORB_IDL
 
 #include <Policy.pidl>
+#include <Services.pidl>
 
 #pragma prefix "omg.org"
 
@@ -80,24 +81,18 @@ module CORBA
     PARAM_INOUT
   };
 
-  typedef string ObjectId;
-  typedef sequence <ObjectId> ObjectIdList;
-
-  typedef unsigned short ServiceType;
-  typedef unsigned long ServiceOption;
-  typedef unsigned long ServiceDetailType;
+  typedef short ValueModifier;
+  const ValueModifier VM_NONE = 0;
+  const ValueModifier VM_CUSTOM = 1;
+  const ValueModifier VM_ABSTRACT = 2;
+  const ValueModifier VM_TRUNCATABLE = 3;
 
-  struct ServiceDetail
-  {
-    ServiceDetailType service_detail_type;
-    sequence <octet> service_detail;
-  };
+  typedef short Visibility;
+  const Visibility PRIVATE_MEMBER = 0;
+  const Visibility PUBLIC_MEMBER = 1;
 
-  struct ServiceInformation
-  {
-    sequence <ServiceOption> service_options;
-    sequence <ServiceDetail> service_details;
-  };
+  typedef string ObjectId;
+  typedef sequence <ObjectId> ObjectIdList;
 
   // Portable Interceptor specification adds these types.
   typedef sequence<string> StringSeq;