On Tuesday 20 January 2009 17:00:35 S Roderick wrote:
> I had to make the following changes to get OCL v1.6.2 to compile under
> GNU/Linux. I am not sure how to fix these two lines, as I am unsure
> what someone was really trying to do here.

I'm sure you're refering to trunk/ocl (which is 1.6.99) and not to the v1.6.2
tar ball. I was getting trunk in shape for 1.8.0. these errors were caused by
(i admit badly resolved...) merge conflicts.

> S
>
> Index: deployment/DeploymentComponent.cpp
> ===================================================================
> --- deployment/DeploymentComponent.cpp (revision 29845)
> +++ deployment/DeploymentComponent.cpp (working copy)
> @@ -243,7 +243,7 @@
> {
> // Should we unload all loaded components here ?
> if ( autoUnload.get() ) {
> - kickOut();
> +// kickOut();

- kickOut();
+ kickOutAll();

> }
> }
>
> @@ -1655,7 +1655,7 @@
> newact = new SlaveActivity(period);
> else {
> newact = new SlaveActivity(master->engine()-
>
> >getActivity());
>
> - master->addPeer( slave );
> +// master->addPeer( slave );

- master->addPeer( slave );
+ master->addPeer( peer );

Both fixed in r29846.

Thanks for reporting. See trunk/rtt/doc/xml/orocos-rtt-changes.xml for the
stuff that changed on trunk (including OCL).

Peter