ChangeLogTag: Thu Apr 20 11:46:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 68 insertions, 60 deletions

diff --git a/ChangeLog b/ChangeLog
index d325244f492..4896e3f29ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 20 11:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/ACE_Init_Test.rc:
+          Removed another msvc specific part
+
 Thu Apr 20 11:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * bin/fuzz.pl:
diff --git a/TAO/orbsvcs/orbsvcs/sfp.idl b/TAO/orbsvcs/orbsvcs/sfp.idl
index e5d58747663..0a8ab39b698 100644
--- a/TAO/orbsvcs/orbsvcs/sfp.idl
+++ b/TAO/orbsvcs/orbsvcs/sfp.idl
@@ -4,16 +4,19 @@
 #ifndef TAO_SFP_IDL
 #define TAO_SFP_IDL
 
+#include <ULongSeq.pidl>
+#include <OctetSeq.pidl>
+
 module flowProtocol
 {
-  typedef sequence <unsigned long> my_seq_ulong;
+  typedef CORBA::ULongSeq my_seq_ulong;
   enum MsgType
   {
     // The MsgTypes Start and struct Start,StartReply and struct
-    // StartReply conflicts. 
-    // Also there are case-only differences for enumerator Credit and struct credit. 
+    // StartReply conflicts.
+    // Also there are case-only differences for enumerator Credit and struct credit.
     // We suffix _Msg to all enumerators until the AVStreams RTF fixes these.
-    // Messages in the forward direction 
+    // Messages in the forward direction
     //    Start,
     Start_Msg,
     EndofStream_Msg,
@@ -27,74 +30,74 @@ module flowProtocol
     Credit_Msg,
     // Addition of type for a fragment.
     Fragment_Msg
-  }; 
-  
+  };
+
   struct frameHeader
-  { 
+  {
     char magic_number[4];
     //    my_seq_char magic_number;
-    // '=', 'S', 'F', 'P' 
-    octet flags;   
-    // bit 0 = byte order, 
-    // 1 = fragments, 2-7 always 0 
-    octet message_type; 
-    unsigned long message_size; 
-    // Size following this header 
-  }; 
-  
+    // '=', 'S', 'F', 'P'
+    octet flags;
+    // bit 0 = byte order,
+    // 1 = fragments, 2-7 always 0
+    octet message_type;
+    unsigned long message_size;
+    // Size following this header
+  };
+
   struct fragment
-  { 
-    //    my_seq_char magic_number; 
+  {
+    //    my_seq_char magic_number;
     char magic_number[4];
-    // 'F', 'R', 'A', 'G' 
-    octet flags; 
-    // bit 1 = more fragments, %%bit 0 = byteorder 
-    unsigned long frag_number; 
-    // 1,..,n 
+    // 'F', 'R', 'A', 'G'
+    octet flags;
+    // bit 1 = more fragments, %%bit 0 = byteorder
+    unsigned long frag_number;
+    // 1,..,n
     unsigned long sequence_num;
-    unsigned long frag_sz; 
-    unsigned long source_id; 
-    // Required for UDP multicast with multiple sources 
-  };                    
-  
+    unsigned long frag_sz;
+    unsigned long source_id;
+    // Required for UDP multicast with multiple sources
+  };
+
   struct Start
-  { 
+  {
     char magic_number[4];
     //    my_seq_char magic_number;
-    // '=', 'S', 'T', 'A' 
-    octet major_version; 
-    octet minor_version; 
-    octet flags; 
-    // bit 0 = byte order 
-  }; 
-  
-  // Acknowledge successful processing of 
-  // Start 
-  
+    // '=', 'S', 'T', 'A'
+    octet major_version;
+    octet minor_version;
+    octet flags;
+    // bit 0 = byte order
+  };
+
+  // Acknowledge successful processing of
+  // Start
+
   struct StartReply
-  { 
+  {
     //    my_seq_char magic_number;
     char magic_number[4];
     // "=",'S','T','R'
-    octet flags; 
-    // bit 0 = byte order, 1 = exception 
-  }; 
-  
-  // If the message_type in frameHeader is sequencedFrame 
-  // the the frameHeader will be followed by this 
-  // (See also RTP note) 
-  
+    octet flags;
+    // bit 0 = byte order, 1 = exception
+  };
+
+  // If the message_type in frameHeader is sequencedFrame
+  // the the frameHeader will be followed by this
+  // (See also RTP note)
+
   struct sequencedFrame
-  { 
-    unsigned long sequence_num; 
-  }; 
-  // If the message_type is Frame then 
-  // the frameHeader is followed by this 
-  // See also RTP note 
-  
+  {
+    unsigned long sequence_num;
+  };
+  // If the message_type is Frame then
+  // the frameHeader is followed by this
+  // See also RTP note
+
   struct frame
-  { 
-    unsigned long timestamp; 
+  {
+    unsigned long timestamp;
     unsigned long synchSource;
     my_seq_ulong source_ids;
     unsigned long sequence_num;
@@ -105,9 +108,9 @@ module flowProtocol
   struct specialFrame
   {
     frameID context_id;
-    sequence<octet> context_data;
+    CORBA::OctetSeq context_data;
   };
-  
+
   struct credit
   {
     //    my_seq_char magic_number;
@@ -115,7 +118,7 @@ module flowProtocol
     // "=",'C','R','E'
     unsigned long cred_num;
   };
-  
+
 };
 
 #endif /* TAO_SFP_IDL */