Tue Jul 27 11:51:25 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * examples/CSD_Strategy/ThreadPool5/Foo.idl:
        * examples/Logging/Logger.idl:
        * tests/DII_Collocation_Tests/oneway/Test.idl:

          Removed anonymous constructs from test IDL and modified
          test code accordingly.

4 files changed, 25 insertions, 12 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 26907f15a47..7950b182f21 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Tue Jul 27 11:51:25 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * examples/CSD_Strategy/ThreadPool5/Foo.idl:
+        * examples/Logging/Logger.idl:
+        * tests/DII_Collocation_Tests/oneway/Test.idl:
+
+          Removed anonymous constructs from test IDL and modified
+          test code accordingly.
+
 Sat Jul 24 20:41:24 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * TAO_IDL/util/utl_global.cpp:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo.idl b/TAO/examples/CSD_Strategy/ThreadPool5/Foo.idl
index 7fd7e4d15f3..36b85adcad6 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo.idl
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo.idl
@@ -11,6 +11,7 @@ typedef sequence<char, 32> Bounded_Var_Size;
 typedef sequence<char> Unbounded_Var_Size;
 typedef long Fixed_Array[20];
 typedef string Var_Array [3];
+typedef string<20> String_20;
 
 struct TimeOfDay {
     short   hour;       // 0 - 23
@@ -40,12 +41,12 @@ interface Foo
 
   oneway void test_unbounded_string_arg(in string message);
 
-  oneway void test_bounded_string_arg(in string<20> message);
+  oneway void test_bounded_string_arg(in String_20 message);
 
   oneway void test_fixed_array_arg(in Fixed_Array message);
 
   oneway void test_var_array_arg(in Var_Array messages);
-    
+
   oneway void test_bounded_var_size_arg(in Bounded_Var_Size message);
 
   oneway void test_unbounded_var_size_arg(in Unbounded_Var_Size message);
diff --git a/TAO/examples/Logging/Logger.idl b/TAO/examples/Logging/Logger.idl
index 2c5428ebff8..72f952e7e28 100644
--- a/TAO/examples/Logging/Logger.idl
+++ b/TAO/examples/Logging/Logger.idl
@@ -8,6 +8,7 @@
 #define TAO_MAXLOGMSGLEN 4 * 1024
 #endif /* TAO_MAXLOGMSGLEN */
 
+typedef string<TAO_MAXLOGMSGLEN> TAO_log_string;
 interface Logger
 {
   // = TITLE
@@ -78,11 +79,11 @@ interface Logger
 
   struct Log_Record
   {
-    Log_Priority type;                 // Type of logging message.
-    long time;                         // Timestamp of the sender.
-    long app_id;                       // Process id of the sender.
-    long host_addr;                    // IP address of the sender.
-    string<TAO_MAXLOGMSGLEN> msg_data; // The logging message.
+    Log_Priority type;       // Type of logging message.
+    long time;               // Timestamp of the sender.
+    long app_id;             // Process id of the sender.
+    long host_addr;          // IP address of the sender.
+    TAO_log_string msg_data; // The logging message.
   };
 
   oneway void log (in Log_Record log_rec);
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Test.idl b/TAO/tests/DII_Collocation_Tests/oneway/Test.idl
index 3bd69e1642a..a38d373dfbe 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Test.idl
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Test.idl
@@ -14,6 +14,8 @@ module Test
   typedef sequence<char> Unbounded_Var_Size_Arg;
   typedef long Fixed_Array[FIX_ARRAY_SIZE];
   typedef string Var_Array [VAR_ARRAY_SIZE];
+  typedef string<BOUNDED_STRING_SIZE> Bounded_String;
+
 
   struct TimeOfDay {
     short   hour;       // 0 - 23
@@ -33,7 +35,7 @@ module Test
 
     oneway void test_unbounded_string_arg(in string message);
 
-    oneway void test_bounded_string_arg(in string<BOUNDED_STRING_SIZE> message);
+    oneway void test_bounded_string_arg(in Bounded_String message);
 
     oneway void test_fixed_array_arg(in Fixed_Array message);
 
@@ -50,7 +52,7 @@ module Test
     oneway void test_objref_arg (in Simple_Test test);
 
     oneway void test_object_arg (in Object o);
-    
+
     oneway void test_args_1 (in Object arg1, 
                              in char arg2, 
                              in Simple_Test arg3);
@@ -59,14 +61,14 @@ module Test
                              in Fixed_Array arg2, 
                              in TimeOfDay arg3);
 
-    oneway void test_args_3 (in string<BOUNDED_STRING_SIZE> arg1, 
+    oneway void test_args_3 (in Bounded_String arg1,
                              in Bounded_Var_Size_Arg arg2, 
                              in Unbounded_Var_Size_Arg arg3,
                              in Var_Array arg4);
-      
+
     /// Return a simple string
     string get_string ();
-  
+
     /// A method to shutdown the ORB
     /**
      * This method is used to simplify the test shutdown process