diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-12-12 17:39:32 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-12-12 17:39:32 +0000 |
| commit | 4c3eea9e2a913c6823766dec2eff694017e8a204 (patch) | |
| tree | 9eb21258ad232f8570e8fe18046c066958d13881 /TAO/orbsvcs | |
| parent | a62e6f9c676bebd420c9409c0bd7e93a05b37ad5 (diff) | |
| download | ATCD-4c3eea9e2a913c6823766dec2eff694017e8a204.tar.gz | |
ChangeLogTag: Fri Dec 12 11:35:30 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'TAO/orbsvcs')
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/Log_i.cpp | 4 |
4 files changed, 14 insertions, 7 deletions
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp index 59a832fac0d..8c4f8055fe7 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp @@ -876,6 +876,9 @@ ifr_adding_visitor::visit_valuetype_fwd (AST_ValueTypeFwd *node) CORBA::Container_ptr current_scope = CORBA::Container::_nil (); + + CORBA::Boolean abstract = + ACE_static_cast (CORBA::Boolean, v->is_abstract ()); if (be_global->ifr_scopes ().top (current_scope) == 0) { @@ -885,7 +888,7 @@ ifr_adding_visitor::visit_valuetype_fwd (AST_ValueTypeFwd *node) v->local_name ()->get_string (), v->version (), 0, // 'custom' not handled yet - v->is_abstract (), + abstract, CORBA::ValueDef::_nil (), 0, // 'truncatable' not handled yet abstract_bases, @@ -1588,6 +1591,9 @@ ifr_adding_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node) ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; + + CORBA::Boolean abstract = + ACE_static_cast (CORBA::Boolean, v->is_abstract ()); this->ir_current_ = ccm_scope->create_event ( @@ -1595,7 +1601,7 @@ ifr_adding_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node) v->local_name ()->get_string (), v->version (), 0, // 'custom' not handled yet - v->is_abstract (), + abstract, CORBA::ValueDef::_nil (), 0, // 'truncatable' not handled yet abstract_bases, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h index a3a6740b5cc..5003c38d475 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h @@ -58,7 +58,7 @@ namespace TAO_LB * residing at the location corresponding to one of the two loads * will be selected at random. */ - const CORBA::Float LL_DEFAULT_LOAD_PERCENT_DIFF_CUTOFF = (CORBA::Float) 0.01; // 1% + const CORBA::Float LL_DEFAULT_LOAD_PERCENT_DIFF_CUTOFF = 0.01f; // 1% //@} } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp index 875b65b2f6d..c1e1bf9d684 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp @@ -144,8 +144,9 @@ TAO_LB_Random::_tao_next_member ( // addition to the fact that the lower order bits should be as // random as the higher order bits. - const CORBA::Float flen = len; // Prevent integer arithmetic - // overflow. + // Prevent integer arithmetic overflow. + const CORBA::Float flen = ACE_static_cast (CORBA::Float, len); + const CORBA::ULong i = ACE_static_cast (CORBA::ULong, flen * ACE_OS::rand () / (RAND_MAX + 1.0)); diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index 64c9225a670..a33ee680cd5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -1247,8 +1247,8 @@ TAO_Log_i::remove_old_records (ACE_ENV_SINGLE_ARG_DECL) static char out[256] = ""; - double temp1 = - ACE_UINT64_DBLCAST_ADAPTER (p_time); + // ACE_UINT64_DBLCAST_ADAPTER doesn't work here with MSVC 7.1. + double temp1 = (double) (p_time); ACE_OS::sprintf (out, "time > %.0f", temp1); |