diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-01-11 01:04:19 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-01-11 01:04:19 +0000 |
| commit | 3ff34521415497b1a72d124dbbc4c136d213b249 (patch) | |
| tree | 4ca49670b35732b1e8becfe43504f1f25fcaad36 | |
| parent | 2e3a97834ac79a34b7c5224c26242e87153f0155 (diff) | |
| download | ATCD-3ff34521415497b1a72d124dbbc4c136d213b249.tar.gz | |
ChangeLogTag:Wed Jan 10 17:02:42 2001 Darrell Brunsch <brunsch@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | TAO/tao/Policy_Manager.cpp | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index fe0297bd115..bb9de7c0320 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Wed Jan 10 17:02:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * tao/Policy_Manager.cpp: + + Version 4. G++ didn't like the last one, so with an + assist from Carlos, used a ptr as an inbetweener. + Does work on MSVC 5 and G++ and my fingers are crossed. + Wed Jan 10 16:52:42 2001 Darrell Brunsch <brunsch@uci.edu> * tao/Policy_Manager.cpp: diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp index b7b66b84943..be7acbe38da 100644 --- a/TAO/tao/Policy_Manager.cpp +++ b/TAO/tao/Policy_Manager.cpp @@ -290,8 +290,8 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( // Because MSVC 5 has a bug, we had to replace // a simple CORBA::Policy_var policy = policies[i]; // with the following. - CORBA::Policy_var policy = - ACE_static_cast (const CORBA::Policy_var &, policies[i]); + CORBA::Policy_ptr temp = policies[i]; + CORBA::Policy_var policy = CORBA::Policy::_duplicate (temp); if (CORBA::is_nil (policy.in ())) continue; |