[prev in list] [next in list] [prev in thread] [next in thread] 

List:       orocos-dev
Subject:    Fwd: [Orocos-Dev] Fwd: the head revision brakes the examples simpletask and task-intro.
From:       klaas.gadeyne () gmail ! com (Klaas Gadeyne)
Date:       2006-05-31 16:25:53
Message-ID: a7b55b4a0605310725u187d2eadg36d9664ae1f51d16 () mail ! gmail ! com
[Download RAW message or body]

---------- Forwarded message ----------
From: Klaas Gadeyne <klaas.gadeyne@gmail.com>
Date: May 31, 2006 4:21 PM
Subject: Re: [Orocos-Dev] Fwd: the head revision brakes the examples
simpletask and task-intro.
To: Erwin Aertbelien <Erwin.Aertbelien@mech.kuleuven.ac.be>


> > However, correction of this leads to a cascade of other poblems (header files
> > that do not seem to exist...)
>
> Jip, confirmed, seems like r4711 broke some stuff
> <http://svn.mech.kuleuven.be/websvn/orocos/?rev=4711&sc=1>
> I'm on it...

s/some/all kinds of/g

The following two patches fix task-intro, but I'm not 100% sure that
what I did was correct, so I won't commit this on trunk until Peter
clarifies what he did (or better, tried to do :-) in r4711.

[kgad@nyquist /tmp/orocos-trunk-test/packages]$
 svn diff
Index: corelib/common/current/include/Attribute.hpp
===================================================================
--- corelib/common/current/include/Attribute.hpp        (revision 4714)
+++ corelib/common/current/include/Attribute.hpp        (working copy)
@@ -26,8 +26,8 @@
  ***************************************************************************/


-#ifndef ORO_TASKATTRIBUTE_HPP
-#define ORO_TASKATTRIBUTE_HPP
+#ifndef ORO_ATTRIBUTE_HPP
+#define ORO_ATTRIBUTE_HPP

 #include "DataSource.hpp"
 #include "DataSources.hpp"
Index: execution/task_context/current/include/AssignVariableCommand.hpp
===================================================================
--- execution/task_context/current/include/AssignVariableCommand.hpp
 (revision 4714)
+++ execution/task_context/current/include/AssignVariableCommand.hpp
 (working copy)
@@ -30,7 +30,7 @@

 #include <corelib/CommandInterface.hpp>
 #include <execution/DataSource.hpp>
-#include <execution/mystd.hpp>
+#include <corelib/mystd.hpp>

 namespace ORO_Execution
 {
Index: execution/task_context/current/include/TaskAttribute.hpp
===================================================================
--- execution/task_context/current/include/TaskAttribute.hpp    (revision 4714)
+++ execution/task_context/current/include/TaskAttribute.hpp    (working copy)
@@ -105,13 +105,13 @@
          */
         template<typename T>
         class TaskAttributeDataSource
-            : public VariableDataSource<T>
+            : public AssignableDataSource<T>
         {
         public:
             typedef boost::intrusive_ptr<TaskAttributeDataSource<T> >
shared_ptr;

             TaskAttributeDataSource( T data )
-                : VariableDataSource<T>( data )
+             : AssignableDataSource<T>( data )
             {
             }

=========================
I'm pretty sure the modifs in the first 2 files are ok, but since
r4711, it's seems like the VariableDataSource<T> class has
disappeared, and I don't know whether replacing it by
AssignableDataSource is ok.

Same thing for the second patch, please review:

[kgad@nyquist /tmp/examples-trunk/task-intro]$
 svn diff PeriodicTaskContext.hpp
Index: PeriodicTaskContext.hpp
===================================================================
--- PeriodicTaskContext.hpp     (revision 4714)
+++ PeriodicTaskContext.hpp     (working copy)
@@ -1,5 +1,6 @@

 #include <execution/GenericTaskContext.hpp>
+#include <execution/TaskAttribute.hpp>
 #include <execution/TemplateFactories.hpp>
 #include <corelib/ZeroTimeThread.hpp>
 #include <corelib/NonPreemptibleActivity.hpp>
@@ -21,13 +22,13 @@
      */
     NonPreemptibleActivity mytask;

-    TaskConstant<double>*       speed_of_light;
+    Constant<double>*       speed_of_light;

     /**
      * Attribute for counter.
      */
-    TaskAttribute<int>*       counter;
-    TaskAttribute<int>*       target;
+    Attribute<int>*       counter;
+    Attribute<int>*       target;

     Property<std::string> parameter;
     Property<PropertyBag> itemcollection;
@@ -67,7 +68,7 @@
         assert ( speed_of_light->get() == 300000000.0 );

         // Demonstration how to retrieve a property from the repository :
-        TaskAttribute<std::string>* par2 =
this->attributeRepository.getAttribute<std::string>("Parameter");
+        Attribute<std::string>* par2 =
this->attributeRepository.getAttribute<std::string>("Parameter");
         assert ( parameter.get() == par2->get() );

         // Demonstration of getting a TaskAttribute :

===============================

ps1.  All this have nothing to do with the fosi patch though.
ps2.  This calls for checking the apps everytime (continuous
integration, indeed) stuff gets committed, especially large
refactoring patches some of us like to produce :-]

regards,

Klaas

[prev in list] [next in list] [prev in thread] [next in thread]