summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-02-01 22:34:42 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-02-01 22:34:42 +0000
commite56fe0c5a1d133978bcd2776abaa12d9c3bf6054 (patch)
treea8bea2519988ff29a0f85d536cf4465f092f5418
parentab404ef7334ec070667d82e389b1da57e505ecde (diff)
downloadATCD-e56fe0c5a1d133978bcd2776abaa12d9c3bf6054.tar.gz
ChangeLogTag:Mon Feb 1 16:33:39 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog-99c7
-rw-r--r--TAO/tao/IIOP_Profile.cpp4
-rw-r--r--TAO/tao/params.cpp9
-rw-r--r--TAO/utils/catior/catior.cpp3
4 files changed, 12 insertions, 11 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 59b5189c0de..835c62031fe 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,10 @@
+Mon Feb 1 16:33:39 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
+
+ * tao/IIOP_Profile.cpp:
+ * tao/params.cpp:
+ * utils/catior/catior.cpp:
+ Fixed some egcs warnings.
+
Mon Feb 1 15:33:59 1999 Fred Kuhns <fredk@cs.wuslt.edu>
* Update Connect.{h,cpp}, removed two unused args
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index e157a451177..63d4d78cee3 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -129,8 +129,8 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const TAO_IIOP_Profile *pfile)
: host_(0),
port_(pfile->port_),
tag_(pfile->tag_),
- version_(pfile->version_),
body_(pfile->body_),
+ version_(pfile->version_),
object_key_(pfile->object_key_),
object_addr_(pfile->object_addr_),
hint_(0)
@@ -146,8 +146,8 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const TAO_IIOP_Profile *pfile)
TAO_IIOP_Profile::TAO_IIOP_Profile (const TAO_IIOP_Profile &pfile)
: host_(0),
port_(pfile.port_),
- body_(pfile.body_),
tag_(pfile.tag_),
+ body_(pfile.body_),
version_(pfile.version_),
object_key_(pfile.object_key_),
object_addr_(pfile.object_addr_),
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
index c05468832bc..fbfd7acd12f 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -9,17 +9,12 @@
ACE_RCSID(tao, params, "$Id$")
TAO_ORB_Parameters::TAO_ORB_Parameters (void)
- : addr_ (),
- host_ (),
- name_service_ior_ (),
- name_service_port_ (0),
- trading_service_ior_ (),
+ : name_service_port_ (0),
trading_service_port_ (0),
sock_rcvbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ),
sock_sndbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ),
cdr_memcpy_tradeoff_ (TAO_DEFAULT_CDR_MEMCPY_TRADEOFF),
- use_lite_protocol_ (0),
- init_ref_ ()
+ use_lite_protocol_ (0)
{
}
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index 6485eb8a287..dd325f96728 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -162,8 +162,7 @@ catior (CORBA::String str,
mb.rd_ptr (1);
mb.wr_ptr (2 * len - 1);
- TAO_InputCDR stream (&mb,
- byteOrder);
+ TAO_InputCDR stream (&mb, ACE_static_cast(int,byteOrder));
if (byteOrder == 1)
ACE_DEBUG ((LM_DEBUG,