summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2002-04-16 00:02:13 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2002-04-16 00:02:13 +0000
commit0aee97e785dcbfc1bfc99247233f713cdb3c0b40 (patch)
tree1c0505ef5bd9e50b5017b46f1dc55ceb7599eaf8 /TAO
parenta197c36ae63910a73f3a65e8d43859720be94c05 (diff)
downloadATCD-0aee97e785dcbfc1bfc99247233f713cdb3c0b40.tar.gz
ChangeLogTag:Mon Apr 15 16:58:40 2002 Ossama Othman <ossama@uci.edu>
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a9
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp2
2 files changed, 10 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 0a64b8c3e85..bdd7d368f7c 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Mon Apr 15 16:58:40 2002 Ossama Othman <ossama@uci.edu>
+
+ * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (init_new_naming):
+
+ Cast the port extracted from the "NameServicePort" environment
+ variable via atoi() to a "u_short" before assigning it another
+ "u_short." Silences a warning about loss of data when
+ converting from an "int" to a "u_short."
+
Mon Apr 15 12:06:47 2002 Ossama Othman <ossama@uci.edu>
* orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
index b077c0d508d..a713699fb89 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
@@ -467,7 +467,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
ACE_OS::getenv ("NameServicePort");
if (port_number != 0)
- port = ACE_OS::atoi (port_number);
+ port = ACE_static_cast (u_short, ACE_OS::atoi (port_number));
}
// Port wasn't specified on the command-line or in environment -