From 32359b9ec0ccf6aeff5b1e0f155e70e808d1b51c Mon Sep 17 00:00:00 2001
From: Francois Bleibel <fbleibel@gmail.com>
Date: Wed, 16 Jun 2010 16:33:10 +0900
Subject: [PATCH] Bug fixes following the reintroduction of casts in
dynamicgraph.
---
include/CMakeLists.txt | 1 +
include/dynamic-graph/signal-base.h | 2 +-
include/dynamic-graph/signal-ptr.t.cpp | 10 +++++-----
include/dynamic-graph/signal.t.cpp | 2 +-
src/signal/signal-array.cpp | 2 +-
unitTesting/test_depend.cpp | 4 ++--
6 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 8ffeba6..957fce3 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -28,6 +28,7 @@ signal.t.cpp
time-dependency.h
time-dependency.t.cpp
signal-caster.h
+all-signals.h
)
# Recreate correct path for the headers
diff --git a/include/dynamic-graph/signal-base.h b/include/dynamic-graph/signal-base.h
index 583c278..dc7d816 100644
--- a/include/dynamic-graph/signal-base.h
+++ b/include/dynamic-graph/signal-base.h
@@ -109,7 +109,7 @@ class SignalBase : public boost::noncopyable
}
/* --- 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 )
{ DG_THROW ExceptionSignal( ExceptionSignal::SET_IMPOSSIBLE,
diff --git a/include/dynamic-graph/signal-ptr.t.cpp b/include/dynamic-graph/signal-ptr.t.cpp
index 73da85f..4763128 100644
--- a/include/dynamic-graph/signal-ptr.t.cpp
+++ b/include/dynamic-graph/signal-ptr.t.cpp
@@ -46,7 +46,7 @@ getPtr ( void )
dgTDEBUGIN(25);
if(! isPluged() )
DG_THROW ExceptionSignal( ExceptionSignal::NOT_INITIALIZED,
- "In sotSignalPtr: SIN ptr not set.",
+ "In SignalPtr: SIN ptr not set.",
" (in signal <%s>)",getName().c_str());
dgTDEBUGOUT(25);
return signalPtr;
@@ -61,7 +61,7 @@ getPtr ( void ) const
dgTDEBUGIN(25);
if(! isPluged() )
{ DG_THROW ExceptionSignal( ExceptionSignal::NOT_INITIALIZED,
- "In sotSignalPtr: SIN ptr not set.",
+ "In SignalPtr: SIN ptr not set.",
" (in signal <%s>)",getName().c_str()); }
dgTDEBUGOUT(25);
return signalPtr;
@@ -73,7 +73,7 @@ getAbstractPtr ( void )
{
if(! isAbstractPluged() )
{ DG_THROW ExceptionSignal( ExceptionSignal::NOT_INITIALIZED,
- "In sotSignalPtr: SIN ptr not set.",
+ "In SignalPtr: SIN ptr not set.",
" (in signal <%s>)",getName().c_str()); }
if( NULL!=signalPtr ) return signalPtr;
else return abstractTransmitter;
@@ -85,7 +85,7 @@ getAbstractPtr ( void ) const
{
if(! isAbstractPluged() )
{ DG_THROW ExceptionSignal( ExceptionSignal::NOT_INITIALIZED,
- "In sotSignalPtr: SIN ptr not set.",
+ "In SignalPtr: SIN ptr not set.",
" (in signal <%s>)",getName().c_str()); }
if( NULL!=signalPtr ) return signalPtr;
else return abstractTransmitter;
@@ -232,7 +232,7 @@ display( std::ostream& os ) const
{
// dgTDEBUG(25) << "Display pointed."<<std::endl;
// getPtr()->display(os<<"PTR->");
- os << " -->-- PLUGED";
+ os << " -->-- PLUGGED";
}
else
{
diff --git a/include/dynamic-graph/signal.t.cpp b/include/dynamic-graph/signal.t.cpp
index 9286e40..f6859b9 100644
--- a/include/dynamic-graph/signal.t.cpp
+++ b/include/dynamic-graph/signal.t.cpp
@@ -2,7 +2,7 @@
* Copyright Projet JRL-Japan, 2007
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
- * File: sotSignal.t.cpp
+ * File: Signal.t.cpp
* Project: SOT
* Author: Nicolas Mansard
*
diff --git a/src/signal/signal-array.cpp b/src/signal/signal-array.cpp
index bd7f5c5..6b3604c 100644
--- a/src/signal/signal-array.cpp
+++ b/src/signal/signal-array.cpp
@@ -2,7 +2,7 @@
* Copyright Projet JRL-Japan, 2007
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
- * File: sotSignalArray.cpp
+ * File: SignalArray.cpp
* Project: SOT
* Author: Nicolas Mansard
*
diff --git a/unitTesting/test_depend.cpp b/unitTesting/test_depend.cpp
index f8b10f5..6f0bb28 100644
--- a/unitTesting/test_depend.cpp
+++ b/unitTesting/test_depend.cpp
@@ -21,7 +21,7 @@
/* -------------------------------------------------------------------------- */
/* --- INCLUDES ------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
-// #include <sot/sotSignal.h>
+// #include <dynamic-graph/all-signals.h>
#include <dynamic-graph/signal.h>
#include <dynamic-graph/signal-time-dependant.h>
//#include <sot/TimeDependancy.h>
@@ -111,7 +111,7 @@ int main( void )
sig2<<sig3,"Sig1");
// cout << "--- Test Array ------ "<<endl;
-// sotSignalArray<int> tarr(12);
+// SignalArray<int> tarr(12);
// tarr<<sig3<<sig2;//+sig2+sig3;
// dispArray(sig4<<sig2<<sig3);
// dispArray(tarr);
--
GitLab