ChangeLogTag:Fri Jun 3 10:21:50 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

2 files changed, 65 insertions, 50 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 4b28c201cb0..54e12424bc9 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Fri Jun  3 10:21:50 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* tests/Any/Recursive/client.cpp:
+
+	  Fixed unused argument warnings in emulated exception builds.
+
+	  Fixed syntax errors in minimum CORBA builds.
+
 Fri Jun  3 09:17:13 2005  Chris Cleeland  <cleeland_c@ociweb.com>
 
         * tests/IOR_Endpoint_Hostnames/list_interfaces.cpp (main):
diff --git a/TAO/tests/Any/Recursive/client.cpp b/TAO/tests/Any/Recursive/client.cpp
index d8dc7ec4a62..299874360b0 100644
--- a/TAO/tests/Any/Recursive/client.cpp
+++ b/TAO/tests/Any/Recursive/client.cpp
@@ -129,6 +129,45 @@ recursive_struct_test (CORBA::ORB_ptr /* orb */,
 }
 
 void
+recursive_union_test (CORBA::ORB_ptr /* orb */,
+                      Test::Hello_ptr /* hello */
+                      ACE_ENV_ARG_DECL_NOT_USED)
+{
+  ACE_DEBUG ((LM_INFO,
+              "Executing recursive union test\n"));
+
+  ACE_DEBUG ((LM_WARNING,
+              "  Currently unimplemented.\n"));
+}
+
+
+void
+indirectly_recursive_valuetype_test (CORBA::ORB_ptr /* orb */,
+                                     Test::Hello_ptr /* hello */
+                                     ACE_ENV_ARG_DECL_NOT_USED)
+{
+  ACE_DEBUG ((LM_INFO,
+              "Executing indirectly recursive valuetype test\n"));
+
+  ACE_DEBUG ((LM_WARNING,
+              "  Currently unimplemented.\n"));
+}
+
+void
+directly_recursive_valuetype_test (CORBA::ORB_ptr /* orb */,
+                                   Test::Hello_ptr /* hello */
+                                   ACE_ENV_ARG_DECL_NOT_USED)
+{
+  ACE_DEBUG ((LM_INFO,
+              "Executing directly recursive valuetype test\n"));
+
+  ACE_DEBUG ((LM_WARNING,
+              "  Currently unimplemented.\n"));
+}
+
+#if TAO_HAS_MINIMUM_CORBA == 0
+
+void
 recursive_struct_typecodefactory_test (CORBA::ORB_ptr orb,
                                        Test::Hello_ptr hello
                                        ACE_ENV_ARG_DECL)
@@ -184,18 +223,6 @@ recursive_struct_typecodefactory_test (CORBA::ORB_ptr orb,
 }
 
 void
-recursive_union_test (CORBA::ORB_ptr /* orb */,
-                      Test::Hello_ptr /* hello */
-                      ACE_ENV_ARG_DECL_NOT_USED)
-{
-  ACE_DEBUG ((LM_INFO,
-              "Executing recursive union test\n"));
-
-  ACE_DEBUG ((LM_WARNING,
-              "  Currently unimplemented.\n"));
-}
-
-void
 recursive_union_typecodefactory_test (CORBA::ORB_ptr /* orb */,
                                       Test::Hello_ptr /* hello */
                                       ACE_ENV_ARG_DECL_NOT_USED)
@@ -207,23 +234,11 @@ recursive_union_typecodefactory_test (CORBA::ORB_ptr /* orb */,
               "  Currently unimplemented.\n"));
 }
 
-
-void
-indirectly_recursive_valuetype_test (CORBA::ORB_ptr /* orb */,
-                                     Test::Hello_ptr /* hello */
-                                     ACE_ENV_ARG_DECL)
-{
-  ACE_DEBUG ((LM_INFO,
-              "Executing indirectly recursive valuetype test\n"));
-
-  ACE_DEBUG ((LM_WARNING,
-              "  Currently unimplemented.\n"));
-}
-
 void
-indirectly_recursive_valuetype_typecodefactory_test (CORBA::ORB_ptr /* orb */,
-                                                     Test::Hello_ptr /* hello */
-                                                     ACE_ENV_ARG_DECL)
+indirectly_recursive_valuetype_typecodefactory_test (
+  CORBA::ORB_ptr /* orb */,
+  Test::Hello_ptr /* hello */
+  ACE_ENV_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_INFO,
               "Executing indirectly recursive valuetype via "
@@ -234,21 +249,9 @@ indirectly_recursive_valuetype_typecodefactory_test (CORBA::ORB_ptr /* orb */,
 }
 
 void
-directly_recursive_valuetype_test (CORBA::ORB_ptr /* orb */,
-                                   Test::Hello_ptr /* hello */
-                                   ACE_ENV_ARG_DECL)
-{
-  ACE_DEBUG ((LM_INFO,
-              "Executing directly recursive valuetype test\n"));
-
-  ACE_DEBUG ((LM_WARNING,
-              "  Currently unimplemented.\n"));
-}
-
-void
 directly_recursive_valuetype_typecodefactory_test (CORBA::ORB_ptr /* orb */,
                                                    Test::Hello_ptr /* hello */
-                                                   ACE_ENV_ARG_DECL)
+                                                   ACE_ENV_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_INFO,
               "Executing directly recursive valuetype via "
@@ -258,6 +261,8 @@ directly_recursive_valuetype_typecodefactory_test (CORBA::ORB_ptr /* orb */,
               "  Currently unimplemented.\n"));
 }
 
+#endif  /* TAO_HAS_MINIMUM_CORBA == 0 */
+
 
 /**
  * @struct Caller
@@ -336,16 +341,18 @@ main (int argc, char *argv[])
                                  Test::Hello_ptr
                                  ACE_ENV_ARG_DECL);
 
-      static test_func tests[] =
+      static test_func const tests[] =
         {
-          recursive_struct_test,
-          recursive_struct_typecodefactory_test,
-          recursive_union_test,
-          recursive_union_typecodefactory_test,
-          indirectly_recursive_valuetype_test,
-          indirectly_recursive_valuetype_typecodefactory_test,
-          directly_recursive_valuetype_test,
-          directly_recursive_valuetype_typecodefactory_test
+          recursive_struct_test
+          , recursive_union_test
+          , indirectly_recursive_valuetype_test
+          , directly_recursive_valuetype_test
+#if TAO_HAS_MINIMUM_CORBA == 0
+          , recursive_struct_typecodefactory_test
+          , recursive_union_typecodefactory_test
+          , indirectly_recursive_valuetype_typecodefactory_test
+          , directly_recursive_valuetype_typecodefactory_test
+#endif  /* TAO_HAS_MINIMUM_CORBA == 0 */
         };
 
       static size_t const test_count = sizeof (tests) / sizeof (test_func);