Skip to content
Snippets Groups Projects
Commit 32359b9e authored by Francois Bleibel's avatar Francois Bleibel
Browse files

Bug fixes following the reintroduction of casts in dynamicgraph.

parent 35a6272f
No related branches found
No related tags found
No related merge requests found
...@@ -28,6 +28,7 @@ signal.t.cpp ...@@ -28,6 +28,7 @@ signal.t.cpp
time-dependency.h time-dependency.h
time-dependency.t.cpp time-dependency.t.cpp
signal-caster.h signal-caster.h
all-signals.h
) )
# Recreate correct path for the headers # Recreate correct path for the headers
......
...@@ -109,7 +109,7 @@ class SignalBase : public boost::noncopyable ...@@ -109,7 +109,7 @@ class SignalBase : public boost::noncopyable
} }
/* --- SET ---------------------------------------------------------------- */ /* --- SET ---------------------------------------------------------------- */
/* Generic set function. Should be reimplemented by the specific sotSignal. /* Generic set function. Should be reimplemented by the specific Signal.
*/ */
virtual void set( std::istringstream& value ) virtual void set( std::istringstream& value )
{ DG_THROW ExceptionSignal( ExceptionSignal::SET_IMPOSSIBLE, { DG_THROW ExceptionSignal( ExceptionSignal::SET_IMPOSSIBLE,
......
...@@ -46,7 +46,7 @@ getPtr ( void ) ...@@ -46,7 +46,7 @@ getPtr ( void )
dgTDEBUGIN(25); dgTDEBUGIN(25);
if(! isPluged() ) if(! isPluged() )
DG_THROW ExceptionSignal( ExceptionSignal::NOT_INITIALIZED, DG_THROW ExceptionSignal( ExceptionSignal::NOT_INITIALIZED,
"In sotSignalPtr: SIN ptr not set.", "In SignalPtr: SIN ptr not set.",
" (in signal <%s>)",getName().c_str()); " (in signal <%s>)",getName().c_str());
dgTDEBUGOUT(25); dgTDEBUGOUT(25);
return signalPtr; return signalPtr;
...@@ -61,7 +61,7 @@ getPtr ( void ) const ...@@ -61,7 +61,7 @@ getPtr ( void ) const
dgTDEBUGIN(25); dgTDEBUGIN(25);
if(! isPluged() ) if(! isPluged() )
{ DG_THROW ExceptionSignal( ExceptionSignal::NOT_INITIALIZED, { DG_THROW ExceptionSignal( ExceptionSignal::NOT_INITIALIZED,
"In sotSignalPtr: SIN ptr not set.", "In SignalPtr: SIN ptr not set.",
" (in signal <%s>)",getName().c_str()); } " (in signal <%s>)",getName().c_str()); }
dgTDEBUGOUT(25); dgTDEBUGOUT(25);
return signalPtr; return signalPtr;
...@@ -73,7 +73,7 @@ getAbstractPtr ( void ) ...@@ -73,7 +73,7 @@ getAbstractPtr ( void )
{ {
if(! isAbstractPluged() ) if(! isAbstractPluged() )
{ DG_THROW ExceptionSignal( ExceptionSignal::NOT_INITIALIZED, { DG_THROW ExceptionSignal( ExceptionSignal::NOT_INITIALIZED,
"In sotSignalPtr: SIN ptr not set.", "In SignalPtr: SIN ptr not set.",
" (in signal <%s>)",getName().c_str()); } " (in signal <%s>)",getName().c_str()); }
if( NULL!=signalPtr ) return signalPtr; if( NULL!=signalPtr ) return signalPtr;
else return abstractTransmitter; else return abstractTransmitter;
...@@ -85,7 +85,7 @@ getAbstractPtr ( void ) const ...@@ -85,7 +85,7 @@ getAbstractPtr ( void ) const
{ {
if(! isAbstractPluged() ) if(! isAbstractPluged() )
{ DG_THROW ExceptionSignal( ExceptionSignal::NOT_INITIALIZED, { DG_THROW ExceptionSignal( ExceptionSignal::NOT_INITIALIZED,
"In sotSignalPtr: SIN ptr not set.", "In SignalPtr: SIN ptr not set.",
" (in signal <%s>)",getName().c_str()); } " (in signal <%s>)",getName().c_str()); }
if( NULL!=signalPtr ) return signalPtr; if( NULL!=signalPtr ) return signalPtr;
else return abstractTransmitter; else return abstractTransmitter;
...@@ -232,7 +232,7 @@ display( std::ostream& os ) const ...@@ -232,7 +232,7 @@ display( std::ostream& os ) const
{ {
// dgTDEBUG(25) << "Display pointed."<<std::endl; // dgTDEBUG(25) << "Display pointed."<<std::endl;
// getPtr()->display(os<<"PTR->"); // getPtr()->display(os<<"PTR->");
os << " -->-- PLUGED"; os << " -->-- PLUGGED";
} }
else else
{ {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Copyright Projet JRL-Japan, 2007 * Copyright Projet JRL-Japan, 2007
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ *+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
* *
* File: sotSignal.t.cpp * File: Signal.t.cpp
* Project: SOT * Project: SOT
* Author: Nicolas Mansard * Author: Nicolas Mansard
* *
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Copyright Projet JRL-Japan, 2007 * Copyright Projet JRL-Japan, 2007
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ *+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
* *
* File: sotSignalArray.cpp * File: SignalArray.cpp
* Project: SOT * Project: SOT
* Author: Nicolas Mansard * Author: Nicolas Mansard
* *
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
/* --- INCLUDES ------------------------------------------------------------- */ /* --- INCLUDES ------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
// #include <sot/sotSignal.h> // #include <dynamic-graph/all-signals.h>
#include <dynamic-graph/signal.h> #include <dynamic-graph/signal.h>
#include <dynamic-graph/signal-time-dependant.h> #include <dynamic-graph/signal-time-dependant.h>
//#include <sot/TimeDependancy.h> //#include <sot/TimeDependancy.h>
...@@ -111,7 +111,7 @@ int main( void ) ...@@ -111,7 +111,7 @@ int main( void )
sig2<<sig3,"Sig1"); sig2<<sig3,"Sig1");
// cout << "--- Test Array ------ "<<endl; // cout << "--- Test Array ------ "<<endl;
// sotSignalArray<int> tarr(12); // SignalArray<int> tarr(12);
// tarr<<sig3<<sig2;//+sig2+sig3; // tarr<<sig3<<sig2;//+sig2+sig3;
// dispArray(sig4<<sig2<<sig3); // dispArray(sig4<<sig2<<sig3);
// dispArray(tarr); // dispArray(tarr);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment