From 2b0fb24c4f7d739b6d75c7b9cd7ffa122f48c9cf Mon Sep 17 00:00:00 2001
From: Peter Soetens <peter@thesourceworks.com>
Date: Wed, 24 Jun 2009 14:34:20 +0200
Subject: [PATCH] Fix minor compilation issues on TAO.

---
 src/corba/ControlTaskI.cpp         |   12 ++++++------
 src/corba/ControlTaskServer.cpp    |    2 +-
 src/corba/CorbaTypeTransporter.hpp |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/corba/ControlTaskI.cpp b/src/corba/ControlTaskI.cpp
index aef952c..ea4b427 100644
--- a/src/corba/ControlTaskI.cpp
+++ b/src/corba/ControlTaskI.cpp
@@ -93,17 +93,17 @@ Orocos_ControlObject_i::~Orocos_ControlObject_i (void)
 {
     if (!CORBA::is_nil(mAttrs))
     {
-        PortableServer::ObjectId_var oid = mpoa->servant_to_id(mAttrs_i);
+        PortableServer::ObjectId_var oid = mpoa->servant_to_id(mAttrs_i.in());
         mpoa->deactivate_object(oid.in());
     }
     if (!CORBA::is_nil(mMFact))
     {
-        PortableServer::ObjectId_var oid = mpoa->servant_to_id(mMFact_i);
+        PortableServer::ObjectId_var oid = mpoa->servant_to_id(mMFact_i.in());
         mpoa->deactivate_object(oid.in());
     }
     if (!CORBA::is_nil(mCFact))
     {
-        PortableServer::ObjectId_var oid = mpoa->servant_to_id(mCFact_i);
+        PortableServer::ObjectId_var oid = mpoa->servant_to_id(mCFact_i.in());
         mpoa->deactivate_object(oid.in());
     }

@@ -280,18 +280,18 @@ Orocos_ControlTask_i::~Orocos_ControlTask_i (void)
 {
     if (!CORBA::is_nil(mEEFact))
     {
-        PortableServer::ObjectId_var oid = mpoa->servant_to_id(mEEFact_i);
+        PortableServer::ObjectId_var oid = mpoa->servant_to_id(mEEFact_i.in());
         mpoa->deactivate_object(oid.in());
     }
     if (!CORBA::is_nil(mService))
     {
-        PortableServer::ObjectId_var oid = mpoa->servant_to_id(mService_i);
+        PortableServer::ObjectId_var oid = mpoa->servant_to_id(mService_i.in());
         mpoa->deactivate_object(oid.in());
     }
     if (!CORBA::is_nil(mDataFlow))
     {
         DataFlowInterface_i::deregisterServant(mtask->ports());
-        PortableServer::ObjectId_var oid = mpoa->servant_to_id(mDataFlow_i);
+        PortableServer::ObjectId_var oid = mpoa->servant_to_id(mDataFlow_i.in());
         mpoa->deactivate_object(oid.in());
     }
 }
diff --git a/src/corba/ControlTaskServer.cpp b/src/corba/ControlTaskServer.cpp
index 9209803..bb94c7d 100644
--- a/src/corba/ControlTaskServer.cpp
+++ b/src/corba/ControlTaskServer.cpp
@@ -71,7 +71,7 @@ namespace RTT

     servers.erase(mtaskcontext);

-    PortableServer::ObjectId_var oid = mpoa->servant_to_id(mtask_i);
+    PortableServer::ObjectId_var oid = mpoa->servant_to_id(mtask_i.in());
     mpoa->deactivate_object(oid);

     if (muse_naming) {
diff --git a/src/corba/CorbaTypeTransporter.hpp b/src/corba/CorbaTypeTransporter.hpp
index 97d0a26..d6d6410 100644
--- a/src/corba/CorbaTypeTransporter.hpp
+++ b/src/corba/CorbaTypeTransporter.hpp
@@ -88,7 +88,7 @@ namespace RTT {
                 catch(CORBA::Exception&) { return false; }
             }

-            ::CORBA::Boolean read(::CORBA::Any_OUT_arg sample)
+            ::CORBA::Boolean read(::CORBA::Any_out sample)
             {
                 if (RTT::ChannelElement<T>::read(data_source->set()))
                 {
--
1.6.0.4