summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-05-09 19:15:35 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-05-09 19:15:35 +0000
commitea1ba9282e909dfa9b40c072241f315794470950 (patch)
tree4514f9934ae7ab0c7db14dd0964778dbe4c182ee
parent703a929a55add1c83da0bd2490e0b310d96cbe75 (diff)
downloadATCD-ea1ba9282e909dfa9b40c072241f315794470950.tar.gz
ChangeLogTag: Mon May 9 19:15:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/tao/Policy_Set.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp
index b0f1dae2218..9739eabc2bc 100644
--- a/TAO/tao/Policy_Set.cpp
+++ b/TAO/tao/Policy_Set.cpp
@@ -171,7 +171,14 @@ TAO_Policy_Set::set_policy_overrides (const CORBA::PolicyList &policies,
for (CORBA::ULong i = 0; i < plen; ++i)
{
+#if defined (__INTEL_COMPILER) && defined (_MSC_VER) && (_MSC_VER <= 1200)
+ // The XICL6 compiler (Intel C++ 7.1 in Visual C++ compatible
+ // mode) has a bug and can't handle the normal construct
+ CORBA::Policy_ptr temp = policies[i];
+ CORBA::Policy_var policy = CORBA::Policy::_duplicate (temp);
+#else
CORBA::Policy_var policy = policies[i];
+#endif
if (CORBA::is_nil (policy.in ()))
{