summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl2
2 files changed, 7 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 3281523f7f7..424ba395fd3 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Tue Apr 3 19:08:44 UTC 2007 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl:
+
+ Added static_cast to avoid conversion warning on MSVC8.
+
Tue Apr 3 18:53:54 UTC 2007 Jeff Parsons <j.parsons@vanderbilt.edu>
* tao/Utils.mpc:
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl
index d3947364e08..4fd78c8df74 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl
@@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
TAO_ECG_UDP_Out_Endpoint::TAO_ECG_UDP_Out_Endpoint (void)
- : request_id_generator_ (ACE_OS::time (0)),
+ : request_id_generator_ (static_cast<CORBA::ULong> (ACE_OS::time (0))),
port_number_ (0),
if_count_ (0),
ifs_ (0)