ChangeLogTag:Fri Jun 18 16:22:19 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

6 files changed, 23 insertions, 8 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index e4afc7b72e9..c85c93dd0e2 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,16 @@
+Fri Jun 18 16:22:19 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* tests/InterOp-Naming/INS_i.cpp:
+	  Fixed warning (and semantic error) in INS_i.cpp, strings
+	  returned from a servant should be duplicated.
+
+	* TAO/orbsvcs/Time_Service/IR_Helper.cpp:
+	* TAO/orbsvcs/Time_Service/IR_Helper.h:
+	* TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h:
+	* TAO/tests/CDR/octet_sequence.cpp:
+	  More char* to const char* conversions, but this time they were
+	  harmless.
+
 Fri Jun 18 15:35:36 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* TAO_IDL/be/be_visitor_array/array_cs.cpp (visit_array): Moved
diff --git a/TAO/orbsvcs/Time_Service/IR_Helper.cpp b/TAO/orbsvcs/Time_Service/IR_Helper.cpp
index 7a89f4d1a14..5ee0027c84d 100644
--- a/TAO/orbsvcs/Time_Service/IR_Helper.cpp
+++ b/TAO/orbsvcs/Time_Service/IR_Helper.cpp
@@ -20,7 +20,7 @@ public:
   Ping_i (int debug = 0) : debug_ (debug) {}
 
   virtual void ping (CORBA::Environment &env = CORBA_Environment::default_environment ())
-  ACE_THROW_SPEC (( CORBA::SystemException ))  
+  ACE_THROW_SPEC (( CORBA::SystemException ))
     {
       if (this->debug_)
         ACE_DEBUG ((LM_DEBUG, "Pong!\n"));
@@ -32,7 +32,7 @@ private:
   int debug_;
 };
 
-IR_Helper::IR_Helper (char *server_name,
+IR_Helper::IR_Helper (const char *server_name,
                       PortableServer::POA_ptr poa,
                       CORBA::ORB_ptr orb,
                       int debug)
diff --git a/TAO/orbsvcs/Time_Service/IR_Helper.h b/TAO/orbsvcs/Time_Service/IR_Helper.h
index e6b7f4d1bf4..a5dbbf9010c 100644
--- a/TAO/orbsvcs/Time_Service/IR_Helper.h
+++ b/TAO/orbsvcs/Time_Service/IR_Helper.h
@@ -34,7 +34,9 @@ class IR_Helper
   //
 {
 public:
-  IR_Helper (char *server_name, PortableServer::POA_ptr poa, CORBA::ORB_ptr orb, int debug = 0);
+  IR_Helper (const char *server_name,
+             PortableServer::POA_ptr poa,
+             CORBA::ORB_ptr orb, int debug = 0);
   // Constructor
   ~IR_Helper ();
   // Destructor
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
index eee31288689..05dd053bd95 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
@@ -254,10 +254,10 @@ private:
   // One of the consumers has completed its work.
 
 private:
-  char* lcl_name_;
+  const char* lcl_name_;
   // The name of the "local" EC.
 
-  char* rmt_name_;
+  const char* rmt_name_;
   // The name of the "remote" EC.
 
   TAO_EC_Gateway_IIOP ecg_;
diff --git a/TAO/tests/CDR/octet_sequence.cpp b/TAO/tests/CDR/octet_sequence.cpp
index 4c4f9519ac6..ba4c405a4ab 100644
--- a/TAO/tests/CDR/octet_sequence.cpp
+++ b/TAO/tests/CDR/octet_sequence.cpp
@@ -25,7 +25,7 @@ ACE_Message_Block * m1;
 ACE_Message_Block * m2;
 ACE_Message_Block * m3;
 
-void dump(char * msg)
+void dump(const char * msg)
 {
   ACE_DEBUG ((LM_INFO,
               "%s\n"
diff --git a/TAO/tests/InterOp-Naming/INS_i.cpp b/TAO/tests/InterOp-Naming/INS_i.cpp
index 31fce2873ed..90706e8f1a0 100644
--- a/TAO/tests/InterOp-Naming/INS_i.cpp
+++ b/TAO/tests/InterOp-Naming/INS_i.cpp
@@ -23,11 +23,11 @@ INS_i::orb (CORBA::ORB_ptr o)
   this->orb_ = CORBA::ORB::_duplicate (o);
 }
 
-char * 
+char *
 INS_i::test_ins (CORBA::Environment &env)
 ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Inside Operation\n"));
-  return ("Success");
+  return CORBA::string_dup ("Success");
 }