diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-01-10 23:57:42 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-01-10 23:57:42 +0000 |
| commit | 88887ccc722f3ba2d5ad8f3a64fcd9b678cf2d9d (patch) | |
| tree | c4a2c97cbe863a33bd4c3fc21ae9ae70229a68f7 | |
| parent | f788d1b3b030730adbada4e851734680894c8b53 (diff) | |
| download | ATCD-88887ccc722f3ba2d5ad8f3a64fcd9b678cf2d9d.tar.gz | |
ChangeLogTag:Wed Jan 10 15:57:42 2001 Darrell Brunsch <brunsch@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | TAO/tao/Policy_Manager.cpp | 8 |
2 files changed, 15 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index deee849b0ef..b71abea6e10 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Wed Jan 10 15:57:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * tao/Policy_Manager.cpp: + + Tried a new patch to get by a compiler problem in MSVC 5. + Now I am using a intermediate variable to help MSVC do + the conversion. + Wed Jan 10 12:07:21 2001 Frank Hunleth <fhunleth@cs.wustl.edu> * tao/Policy_Manager.cpp: diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp index 616fa611e3f..4a2e7cb22f1 100644 --- a/TAO/tao/Policy_Manager.cpp +++ b/TAO/tao/Policy_Manager.cpp @@ -287,7 +287,13 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( for (CORBA::ULong i = 0; i < policies.length (); ++i) { - CORBA::Policy_var policy = policies[i]; + // Because MSVC has a bug, we had to replace + // a simple CORBA::Policy_var policy = policies[i]; + // with the following lines. + const CORBA::Policy_var &const_policy = + ACE_static_cast (const CORBA::Policy_var &, policies[i]); + CORBA::Policy_var policy = const_policy; + if (CORBA::is_nil (policy.in ())) continue; |