geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r355666 - /geronimo/specs/trunk/geronimo-spec-corba/src/main/idl/GIOP.idl
Date Sat, 10 Dec 2005 00:43:49 GMT
Author: adc
Date: Fri Dec  9 16:43:48 2005
New Revision: 355666

URL: http://svn.apache.org/viewcvs?rev=355666&view=rev
Log:
Needed earlier versions as well.

Modified:
    geronimo/specs/trunk/geronimo-spec-corba/src/main/idl/GIOP.idl

Modified: geronimo/specs/trunk/geronimo-spec-corba/src/main/idl/GIOP.idl
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-corba/src/main/idl/GIOP.idl?rev=355666&r1=355665&r2=355666&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-corba/src/main/idl/GIOP.idl (original)
+++ geronimo/specs/trunk/geronimo-spec-corba/src/main/idl/GIOP.idl Fri Dec  9 16:43:48 2005
@@ -119,19 +119,8 @@
     SYSTEM_EXCEPTION,
     LOCATION_FORWARD
   };
+#endif
 
-  // GIOP 1.0
-  struct ReplyHeader_1_0 {// Renamed from ReplyHeader
-    IOP::ServiceContextList service_context;
-    unsigned long request_id;
-    ReplyStatusType_1_0 reply_status;
-  };
-
-  // GIOP 1.1
-  typedef ReplyHeader_1_0 ReplyHeader_1_1;
-
-  // Same Header contents for 1.0 and 1.1
-#else
   // GIOP 1.2
   enum ReplyStatusType_1_2 {
     NO_EXCEPTION,USER_EXCEPTION,
@@ -141,12 +130,23 @@
     NEEDS_ADDRESSING_MODE // new value for 1.2
   };
   
+  // GIOP 1.0
+  struct ReplyHeader_1_0 {// Renamed from ReplyHeader
+      IOP::ServiceContextList     service_context;
+      unsigned long               request_id;
+      ReplyStatusType_1_2         reply_status;
+  };
+
+  // GIOP 1.1
+  typedef ReplyHeader_1_0 ReplyHeader_1_1;
+
+  // Same Header contents for 1.0 and 1.1
+
   struct ReplyHeader_1_2 {
     unsigned long request_id;
     ReplyStatusType_1_2 reply_status;
     IOP::ServiceContextList service_context; // 1.2 change
   };
-#endif // GIOP_1_2
 
   struct SystemExceptionReplyBody {
     string exception_id;



Mime
View raw message