ChangeLogTag: Tue Sep 28 17:46:42 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>

5 files changed, 23 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index cf74b22162f..79c560c0fa7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Tue Sep 28 17:46:42 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/Alt_Mapping/alt_mapping_i.cpp:
+        * tests/Alt_Mapping/server.cpp:
+        * tests/Alt_Mapping/alt_mapping_i.h:
+        * tests/Alt_Mapping/driver.cpp:
+        
+          Updated to
+            - use const std::string<>& for IN arg signature
+            - use ORB_init() with std::string for ORB name arg
+
 Tue Sep 28 17:35:31 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/Event_Service/Event_Service.cpp:
diff --git a/tests/Alt_Mapping/alt_mapping_i.cpp b/tests/Alt_Mapping/alt_mapping_i.cpp
index 99e2f12bc12..62bccdb9d4c 100644
--- a/tests/Alt_Mapping/alt_mapping_i.cpp
+++ b/tests/Alt_Mapping/alt_mapping_i.cpp
@@ -30,7 +30,7 @@ Alt_Mapping_i::~Alt_Mapping_i (void)
 // the in string. For the inout, we append the same string to itself and send
 // it back
 std::string
-Alt_Mapping_i::test_unbounded_string (const std::string s1,
+Alt_Mapping_i::test_unbounded_string (const std::string &s1,
                                       std::string &s2,
                                       std::string &s3)
 {
diff --git a/tests/Alt_Mapping/alt_mapping_i.h b/tests/Alt_Mapping/alt_mapping_i.h
index 0014074f1fa..a9f3913f78d 100644
--- a/tests/Alt_Mapping/alt_mapping_i.h
+++ b/tests/Alt_Mapping/alt_mapping_i.h
@@ -27,7 +27,7 @@ public:
   ~Alt_Mapping_i (void);
 
   virtual std::string
-  test_unbounded_string (const std::string s1,
+  test_unbounded_string (const std::string &s1,
                          std::string &s2,
                          std::string &s3);
 
diff --git a/tests/Alt_Mapping/driver.cpp b/tests/Alt_Mapping/driver.cpp
index 6a8c6abee1d..f492d165e2b 100644
--- a/tests/Alt_Mapping/driver.cpp
+++ b/tests/Alt_Mapping/driver.cpp
@@ -65,18 +65,22 @@ Driver::init (int argc, ACE_TCHAR **argv)
   try
     {
       ACE_OS::strcpy (exception_string, "ORB Initialization");
+      std::string orb_name ("internet");
 
       // Retrieve the underlying ORB
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    "internet");
+                                    orb_name);
 
       // Parse command line and verify parameters.
       if (opt->parse_args (argc, argv) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) driver.cpp - "
-                           "parse_args failed\n"),
-                          -1);
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) driver.cpp - "
+                             "parse_args failed\n"),
+                            -1);
+        }
+        
       // Retrieve a Param_Test object reference
       ACE_OS::strcpy (exception_string,"ORB::string_to_object() failed.");
 
diff --git a/tests/Alt_Mapping/server.cpp b/tests/Alt_Mapping/server.cpp
index 7d4a81fc6a8..4532a55a5cf 100644
--- a/tests/Alt_Mapping/server.cpp
+++ b/tests/Alt_Mapping/server.cpp
@@ -60,7 +60,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
   try
     {
-      const char *orb_name = "";
+      std::string orb_name;
       CORBA::ORB_var orb_ptr =
         CORBA::ORB_init (argc, argv, orb_name);