summaryrefslogtreecommitdiff
path: root/TAO/tao
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-06-21 07:44:31 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-06-21 07:44:31 +0000
commita33cdabbc14c47bfa9cf76c17dad9fa3d23629a7 (patch)
tree644d486be15ee08c627346b932d5f2105db8ffa0 /TAO/tao
parent23bb82de4f48fe18c943703e12c30207bd64bfeb (diff)
downloadATCD-a33cdabbc14c47bfa9cf76c17dad9fa3d23629a7.tar.gz
ChangeLogTag: Wed Jun 21 07:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao')
-rw-r--r--TAO/tao/BD_String_Argument_T.cpp5
-rw-r--r--TAO/tao/PortableServer.mpc2
2 files changed, 4 insertions, 3 deletions
diff --git a/TAO/tao/BD_String_Argument_T.cpp b/TAO/tao/BD_String_Argument_T.cpp
index ed907aa0681..97b201dd779 100644
--- a/TAO/tao/BD_String_Argument_T.cpp
+++ b/TAO/tao/BD_String_Argument_T.cpp
@@ -32,9 +32,10 @@ void
TAO::In_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::interceptor_value (
CORBA::Any *any) const
{
- Insert_Policy<typename S_var::s_traits::from_type>::any_insert (
+ typedef typename S_var::s_traits::from_type from_type;
+ Insert_Policy<from_type>::any_insert (
any,
- S_var::s_traits::from_type (this->x_, BOUND)
+ from_type (this->x_, BOUND)
);
}
diff --git a/TAO/tao/PortableServer.mpc b/TAO/tao/PortableServer.mpc
index 37c5f2dc24e..84d8ebd4ddd 100644
--- a/TAO/tao/PortableServer.mpc
+++ b/TAO/tao/PortableServer.mpc
@@ -40,6 +40,7 @@ project : taolib, core, core_anytypecode, tao_versioning_idl_defaults {
PortableServer/ServantManager.pidl
PortableServer/ServantRetentionPolicy.pidl
PortableServer/ThreadPolicy.pidl
+ PortableServer/ForwardRequest.pidl
}
IDL_Files {
@@ -52,7 +53,6 @@ project : taolib, core, core_anytypecode, tao_versioning_idl_defaults {
PortableServer/POAManagerFactory.pidl
PortableServer/POA.pidl
PortableServer/PS_Current.pidl
- PortableServer/ForwardRequest.pidl
}
PIDL_Files {