diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2005-09-28 20:08:09 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2005-09-28 20:08:09 +0000 |
| commit | 869c0d8c8ba269354abc505e635a2ac39385e5a5 (patch) | |
| tree | 66dd9deb2ad213d3748f649ccec69254417cf221 | |
| parent | 1a1e865e5594b9275f4e897d155d78bf16d6d0c9 (diff) | |
| download | ATCD-869c0d8c8ba269354abc505e635a2ac39385e5a5.tar.gz | |
ChangeLogTag: Wed Sep 28 20:05:12 UTC 2005 Martin Corino <mcorino@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Acceptor.cpp | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1c603c6f03c..c20b5b4673c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Wed Sep 28 20:05:12 UTC 2005 Martin Corino <mcorino@remedy.nl> + + * tao/IIOP_Acceptor.cpp: + + Fixed compile error for Borland compiler. + Wed Sep 28 18:42:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/Naming/Naming_Server.cpp: @@ -29,7 +35,7 @@ Wed Sep 28 11:35:17 2005 Chad Elliott <elliott_c@ociweb.com> the destruction of smart proxies and a _non_existent() crash. -Fri Sep 28 15:21:12 UTC 2005 Martin Corino <mcorino@remedy.nl> +Wed Sep 28 15:21:12 UTC 2005 Martin Corino <mcorino@remedy.nl> * tao/Acceptor_Registry{.h .cpp}: * tao/IIOP_Acceptor{.h .cpp .i}: diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index 55bc7188002..d6aa991b105 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -38,7 +38,7 @@ TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (CORBA::Boolean flag) #if defined (ACE_HAS_IPV6) default_address_ (static_cast<unsigned short> (0), ACE_IPV6_ANY, AF_INET6), #else - default_address_ (static_cast<unsigned short> (0), INADDR_ANY), + default_address_ (static_cast<unsigned short> (0), static_cast<ACE_UINT32> (INADDR_ANY)), #endif /* ACE_HAS_IPV6 */ base_acceptor_ (), creation_strategy_ (0), |