Test for NT

6 files changed, 17 insertions, 42 deletions

diff --git a/TAO/tests/Param_Test/Makefile b/TAO/tests/Param_Test/Makefile
index 55b49b0b855..3742f505e22 100644
--- a/TAO/tests/Param_Test/Makefile
+++ b/TAO/tests/Param_Test/Makefile
@@ -93,7 +93,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 override TAO_IDLFLAGS += -hc Cli.h -hs Ser.h -hT Ser_T.h \
 			 -cs Cli.cpp -ci Cli.i \
-			 -ss Ser.cpp -sT Ser_T.cpp  -si Ser.i -st Ser_T.i
+			 -ss Ser.cpp -sT Ser_T.cpp  
 
 TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
 CPPFLAGS += -I$(TAO_ROOT) $(TSS_ORB_FLAG)
diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp
index c398d4a4d78..d0ccfa3c131 100644
--- a/TAO/tests/Param_Test/driver.cpp
+++ b/TAO/tests/Param_Test/driver.cpp
@@ -470,6 +470,7 @@ Driver::run (void)
         delete client;
       }
       break;
+#if 0
     case Options::TEST_MULTDIM_ARRAY:
       {
         Param_Test_Client<Test_Multdim_Array> *client = new
@@ -483,6 +484,7 @@ Driver::run (void)
         delete client;
       }
       break;
+#endif
     default:
       break;
     }
@@ -534,7 +536,9 @@ template class Param_Test_Client<Test_Fixed_Array>;
 template class Param_Test_Client<Test_Var_Array>;
 template class Param_Test_Client<Test_Exception>;
 template class Param_Test_Client<Test_Big_Union>;
+#if 0
 template class Param_Test_Client<Test_Multdim_Array>;
+#endif
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
@@ -564,6 +568,7 @@ template class Param_Test_Client<Test_Multdim_Array>;
 #pragma instantiate Param_Test_Client<Test_Var_Array>
 #pragma instantiate Param_Test_Client<Test_Exception>
 #pragma instantiate Param_Test_Client<Test_Big_Union>
+#if 0
 #pragma instantiate Param_Test_Client<Test_Multdim_Array>
-
+#endif
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/Param_Test/multdim_array.cpp b/TAO/tests/Param_Test/multdim_array.cpp
index d74f02dffca..618dfbd312c 100644
--- a/TAO/tests/Param_Test/multdim_array.cpp
+++ b/TAO/tests/Param_Test/multdim_array.cpp
@@ -13,10 +13,11 @@
 //      Bala
 //
 // ============================================================================
-
+# if 0
 #include "helper.h"
 #include "multdim_array.h"
 
+
 ACE_RCSID(Param_Test, fixed_array, "$Id$")
 
 // ************************************************************************
@@ -206,3 +207,5 @@ Test_Multdim_Array::print (const Param_Test::Multdim_Array_slice *a)
         }
     }
 }
+
+#endif 
diff --git a/TAO/tests/Param_Test/param_test.idl b/TAO/tests/Param_Test/param_test.idl
index 60587735e7c..db82803d67f 100644
--- a/TAO/tests/Param_Test/param_test.idl
+++ b/TAO/tests/Param_Test/param_test.idl
@@ -272,10 +272,12 @@ interface Param_Test
   const unsigned long DIM3 = 3;
   typedef Fixed_Array Multdim_Array [DIM2][DIM3];
 
+# if 0
   Multdim_Array test_multdim_array (in Multdim_Array m1,
                                     inout Multdim_Array m2,
                                     out Multdim_Array m3);
 
+#endif
 
   // sequence of typecodes
   //  typedef sequence<TypeCode> TypeCodeSeq;
@@ -289,43 +291,4 @@ interface Param_Test
   // test simple objects
   //  Object test_object (in Object o1, inout Object o2, out Object o3);
 
-  /*
-  long test_long (in long l1,
-                  inout long l2,
-                  out long l3);
-  char test_char (in char c1,
-                  inout char c2,
-                  out char c3);
-  octet test_octet (in octet o1,
-                    inout octet o2,
-                    out octet o3);
-
-  double test_double (in double d1,
-                      inout double d2,
-                      out double d3);
-
-  // strings bounded
-  const unsigned long STRLEN = 10;
-  string<STRLEN> test_bstring (in string<STRLEN> s1,
-                               inout string<STRLEN> s2,
-                               out string<STRLEN> s3);
-
-  // typedefed string
-  typedef string MYSTRING;
-  MYSTRING test_tstring (in MYSTRING s1,
-                         inout MYSTRING s2,
-                         out MYSTRING s3);
-
-
-  // more combinations to follow
-  union U switch (long)
-    {
-    case 0: sequence<char> cseq;
-    case 1: sequence<octet> oseq;
-    case 2: StrSeq sseq;
-    };
-
-  // complex (but meaningless) to test the naming scheme
-  typedef sequence <sequence <sequence <long>, 5>, 10> complex;
-  */
 };
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
index 257724ad839..c09be8d9b98 100644
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ b/TAO/tests/Param_Test/param_test_i.cpp
@@ -782,6 +782,7 @@ Param_Test_i::test_big_union (const Param_Test::Big_Union& u1,
   return ret._retn ();
 }
 
+#if 0
 Param_Test::Multdim_Array_slice *
 Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1,
                                   Param_Test::Multdim_Array a2,
@@ -796,6 +797,7 @@ Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1,
   return ret;
 }
 
+#endif
 void
 Param_Test_i::shutdown (CORBA::Environment &)
 {
diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h
index 77da2bb01fd..ab8c89250f7 100644
--- a/TAO/tests/Param_Test/param_test_i.h
+++ b/TAO/tests/Param_Test/param_test_i.h
@@ -234,6 +234,7 @@ public:
                     Param_Test::Big_Union_out u3,
                     CORBA::Environment &env);
 
+# if 0
   // Test for multi dimensional arrays
   virtual Param_Test::Multdim_Array_slice *
   test_multdim_array (const Param_Test::Multdim_Array,
@@ -241,6 +242,7 @@ public:
                       Param_Test::Multdim_Array_out ,
                       CORBA::Environment &);
   
+#endif
   void shutdown (CORBA::Environment &env);