diff --git a/include/dynamic-graph/debug.h b/include/dynamic-graph/debug.h index 99e0148dccb3cdef4264561d1b309bc7ccd86477..0b992a238c2114281aa37564808d8aa8309a7431 100644 --- a/include/dynamic-graph/debug.h +++ b/include/dynamic-graph/debug.h @@ -97,8 +97,8 @@ class DYNAMICGRAPH_EXPORT DebugTrace inline void traceTemplate( const char* format,...) { DG_COMMON_TRACES; tmpbuffer.str(""); } - inline DebugTrace& pre( const std::ostream& dummy ) { return *this; } - inline DebugTrace& pre( const std::ostream& dummy,int level ) + inline DebugTrace& pre( const std::ostream&) { return *this; } + inline DebugTrace& pre( const std::ostream&, int level) { traceLevel = level; return *this; } /* inline DebugTrace& preTemplate( const std::ostream& dummy,int level ) */ /* { traceLevelTemplate = level; return *this; } */ @@ -142,14 +142,14 @@ inline bool dgTDEBUG_ENABLE( const int & level ) { return level<=VP_TEMPLATE_DEB # define dgDEBUG(level) if( 1 ) ; else std::cout # define dgDEBUGMUTE(level) if( 1 ) ; else std::cout # define dgERROR dgERRORFLOW.outputbuffer << dgPREERROR -inline void dgDEBUGF( const int level,const char* format,...) { return; } -inline void dgDEBUGF( const char* format,...) { return; } -inline void dgERRORF( const int level,const char* format,...) { return; } -inline void dgERRORF( const char* format,...) { return; } +inline void dgDEBUGF( const int, const char*,...) { return; } +inline void dgDEBUGF( const char*, ...) { return; } +inline void dgERRORF( const int, const char*,...) { return; } +inline void dgERRORF( const char*, ...) { return; } // TEMPLATE # define dgTDEBUG(level) if( 1 ) ; else std::cout -inline void dgTDEBUGF( const int level,const char* format,...) { return; } -inline void dgTDEBUGF( const char* format,...) { return; } +inline void dgTDEBUGF( const int, const char*,...) { return; } +inline void dgTDEBUGF( const char*,...) { return; } #define dgDEBUG_ENABLE(level) false #define dgTDEBUG_ENABLE(level) false diff --git a/include/dynamic-graph/entity.h b/include/dynamic-graph/entity.h index b2c800f38d61ca509239c1c4445261147214a422..769746091ce4692ceeed3d48aa056f26ac94d042 100644 --- a/include/dynamic-graph/entity.h +++ b/include/dynamic-graph/entity.h @@ -94,7 +94,7 @@ class DYNAMICGRAPH_EXPORT Entity std::ostream& os ); virtual SignalBase<int>* test(void) { return 0; } - virtual void test2( SignalBase<int>* ptr ) { return ; } + virtual void test2( SignalBase<int>* ) { return ; } virtual const std::string& getCommandList( void ) const; }; diff --git a/include/dynamic-graph/factory.h b/include/dynamic-graph/factory.h index e0027977c7fb646c9bc6a16f9ffb2bb1465617a6..934570a66a2e35bb267a61f85729820dda870147 100644 --- a/include/dynamic-graph/factory.h +++ b/include/dynamic-graph/factory.h @@ -109,16 +109,17 @@ class DYNAMICGRAPH_EXPORT EntityRegisterer * of classType to the g_factory. It is then possible to create it * with the g_factory. */ -#define DYNAMICGRAPH_FACTORY_ENTITY_PLUGIN(classType,className) \ - const std::string classType::CLASS_NAME = className; \ - extern "C" { \ - Entity *EntityMaker##_##classType( const std::string& objname ) \ - { \ - return new classType( objname ); \ - } \ - EntityRegisterer reg##_##classType( className, \ - &EntityMaker##_##classType ); \ - } \ +#define DYNAMICGRAPH_FACTORY_ENTITY_PLUGIN(classType,className) \ + const std::string classType::CLASS_NAME = className; \ + extern "C" { \ + Entity *EntityMaker##_##classType( const std::string& objname ) \ + { \ + return new classType( objname ); \ + } \ + EntityRegisterer reg##_##classType( className, \ + &EntityMaker##_##classType ); \ + } \ + struct e_n_d__w_i_t_h__s_e_m_i_c_o_l_o_n } // namespace dynamicgraph diff --git a/include/dynamic-graph/signal-base.h b/include/dynamic-graph/signal-base.h index 843dc922b7c9aa2e119d438f2430d2f7079a90d5..de98d58b3deb18679363b9b52d1d76facffe1fcf 100644 --- a/include/dynamic-graph/signal-base.h +++ b/include/dynamic-graph/signal-base.h @@ -51,7 +51,7 @@ class SignalBase : public boost::noncopyable const bool& getReady( void ) const { return ready; } const std::string& getName( void ) const { return name; } - virtual void setPeriodTime( const Time& p ) {} + virtual void setPeriodTime( const Time& ) {} virtual Time getPeriodTime( void ) const { return 1; } public: @@ -65,11 +65,11 @@ class SignalBase : public boost::noncopyable /* --- DEPENDENCIES ------------------------------------------------------- */ - virtual void addDependency( const SignalBase<Time>& signal ) {} - virtual void removeDependency( const SignalBase<Time>& signal ) {} + virtual void addDependency( const SignalBase<Time>& ) {} + virtual void removeDependency( const SignalBase<Time>& ) {} virtual void clearDependencies( void ) {} - virtual bool needUpdate( const Time& t ) const {return ready;} + virtual bool needUpdate( const Time& ) const {return ready;} inline void setReady( const bool sready = true ) { ready = sready; } virtual std::ostream & @@ -79,9 +79,9 @@ class SignalBase : public boost::noncopyable } virtual std::ostream& - displayDependencies( std::ostream& os,const int depth=-1, + displayDependencies( std::ostream& os,const int=-1, std::string space="", - std::string next1="",std::string next2="" ) const + std::string next1="",std::string ="" ) const { os << space << next1 << "-- "; display(os); return os; @@ -115,22 +115,22 @@ class SignalBase : public boost::noncopyable /* Generic set function. Should be reimplemented by the specific Signal. * Sets a signal value */ - virtual void set( std::istringstream& value ) + virtual void set( std::istringstream&) { DG_THROW ExceptionSignal( ExceptionSignal::SET_IMPOSSIBLE, "Set operation not possible with this signal. ", "(while trying to set %s).",this->getName().c_str() ); } - virtual void get( std::ostream& os ) const + virtual void get(std::ostream&) const { DG_THROW ExceptionSignal( ExceptionSignal::SET_IMPOSSIBLE, "Get operation not possible with this signal. ", "(while trying to get %s).",this->getName().c_str() ); } - virtual inline void recompute( const Time & t) + virtual inline void recompute( const Time &) { DG_THROW ExceptionSignal( ExceptionSignal::SET_IMPOSSIBLE, "Recompute operation not possible with this signal. ", "(while trying to recompute %s).",this->getName().c_str() ); } - virtual void trace( std::ostream& os ) const + virtual void trace( std::ostream& ) const { DG_THROW ExceptionSignal( ExceptionSignal::SET_IMPOSSIBLE, "Trace operation not possible with this signal. ", "(while trying to trace %s).",this->getName().c_str() ); diff --git a/include/dynamic-graph/signal.t.cpp b/include/dynamic-graph/signal.t.cpp index 45c77c644402023225b5c6235d5b987c70e929ce..be66f942eb62fd0f37f6ad4bd187edef004eb076 100644 --- a/include/dynamic-graph/signal.t.cpp +++ b/include/dynamic-graph/signal.t.cpp @@ -87,7 +87,7 @@ namespace dynamicgraph { template< class T,class Time > Signal<T,Time>:: Signal( std::string name ) - :__SIGNAL_INIT(name,,NULL,NULL,NULL) + :__SIGNAL_INIT(name,T(),NULL,NULL,NULL) { return; } diff --git a/src/debug/debug.cpp b/src/debug/debug.cpp index 3a588779b6dc8621436f22c4777c02f21f8507dd..39bfb4eb8da53509a53ab2aaf5c9b37d43d1ffb4 100644 --- a/src/debug/debug.cpp +++ b/src/debug/debug.cpp @@ -63,7 +63,7 @@ void DebugTrace::openFile( const char * filename ) //std::cout << filename << dg_debugfile.good() << dg_debugfile.is_open() << std::endl; } -void DebugTrace::closeFile( const char * filename ) +void DebugTrace::closeFile(const char *) { if( dg_debugfile.good()&&dg_debugfile.is_open() ) { dg_debugfile.close(); } dg_debugfile.setstate( std::ios::failbit ) ; diff --git a/src/dgraph/import.cpp b/src/dgraph/import.cpp index e355e38f7a50ece0569267c8909f86fa83d6f820..f7e12fffddefec1207cb780a73b9762e9c393c7e 100644 --- a/src/dgraph/import.cpp +++ b/src/dgraph/import.cpp @@ -238,7 +238,7 @@ namespace dynamicgraph dgDEBUGOUT(15); } - void pushImportPaths (dynamicgraph::Interpreter& interpreter, + void pushImportPaths (dynamicgraph::Interpreter&, const std::string& cmdLine, std::istringstream& cmdArg, std::ostream& os) @@ -256,9 +256,9 @@ namespace dynamicgraph importPaths.push_back (path); } - void popImportPaths (dynamicgraph::Interpreter& interpreter, + void popImportPaths (dynamicgraph::Interpreter&, const std::string& cmdLine, - std::istringstream& cmdArg, + std::istringstream&, std::ostream& os) { if (cmdLine == "help") diff --git a/src/dgraph/interpreter-helper.cpp b/src/dgraph/interpreter-helper.cpp index 43686238b027de5dca18ed20bd607fac47ba30af..6483594974b7846b02d18e505ffe5b8cdcbc6198 100644 --- a/src/dgraph/interpreter-helper.cpp +++ b/src/dgraph/interpreter-helper.cpp @@ -52,7 +52,7 @@ using namespace std; void InterpreterHelper:: cmdPlug( const std::string& obj1, const std::string & signame1, const std::string& obj2, const std::string & signame2, - std::ostream& os ) + std::ostream& ) { dgDEBUG(20) << "Get Ent1 <"<<obj1<<"> ."<<endl; Entity& ent1 = g_pool.getEntity(obj1); @@ -85,7 +85,7 @@ cmdNew( const std::string& className, void InterpreterHelper:: cmdDestroy( const std::string& objName, - std::ostream& os) + std::ostream& ) { dgDEBUG(15) << "Destroy <" << objName <<"> requested."<<endl; @@ -96,7 +96,7 @@ cmdDestroy( const std::string& objName, void InterpreterHelper:: cmdLoadPlugin( const std::string& directory, const std::string& pluginName, - std::ostream& os ) + std::ostream& ) { if( directory.length() != 0 ) dlPtr.setDirectory( directory ); @@ -110,7 +110,7 @@ cmdLoadPlugin( const std::string& directory, void InterpreterHelper:: cmdUnloadPlugin( const std::string& pluginName, - std::ostream& os ) + std::ostream& ) { dgDEBUGIN(15); @@ -133,7 +133,7 @@ void InterpreterHelper:: cmdSetSignal( const std::string& objname, const std::string& signame, const std::string& value, - std::ostream& os ) + std::ostream& ) { dgDEBUGIN(15); @@ -167,7 +167,7 @@ void InterpreterHelper:: cmdComputeSignal( const std::string& objname, const std::string& signame, const int &time, - std::ostream& os ) + std::ostream& ) { dgDEBUGIN(15); diff --git a/src/plugins/shell-procedure.cpp b/src/plugins/shell-procedure.cpp index fd4e4707410afee8f5bfe8b6e6f50b0a56272fb6..973966b4f4fd24e78bfaf7dc8a62da51b7f77a93 100644 --- a/src/plugins/shell-procedure.cpp +++ b/src/plugins/shell-procedure.cpp @@ -81,7 +81,7 @@ cmdContinueProcedure( const std::string& cmdLine,std::istringstream& args,std::o } void ShellProcedure:: -cmdEndProcedure( const std::string& cmdLine,std::istringstream& args,std::ostream& os ) +cmdEndProcedure( const std::string& cmdLine,std::istringstream&, std::ostream& os ) { if( cmdLine == "help" ) { diff --git a/src/shell/functions.cpp b/src/shell/functions.cpp index 06da286793cc113ee37a9dfbb9873fc70a76e34b..5900e9c94d5c2afd15624585a3a4ab56db97f1c5 100644 --- a/src/shell/functions.cpp +++ b/src/shell/functions.cpp @@ -92,7 +92,7 @@ cmdClearPlugin( const std::string cmdLine, std::istringstream& cmdArg, std::ostr } void ShellFunctions:: -cmdDisplayPlugins( const std::string cmdLine, std::istringstream& cmdArg, std::ostream& os ) +cmdDisplayPlugins( const std::string cmdLine, std::istringstream&, std::ostream& os ) { if( cmdLine == "help" ) { @@ -132,7 +132,7 @@ cmdDisplayFactory( const std::string cmdLine, std::istringstream& cmdArg, } void ShellFunctions:: -cmdCommentary( const std::string cmdLine, std::istringstream& cmdArg, std::ostream& os ) +cmdCommentary( const std::string cmdLine, std::istringstream&, std::ostream& os ) { if( cmdLine == "help" ) { os << " # comment with '#': ignore the end of the line." <<endl; } @@ -439,7 +439,7 @@ cmdSleep( const std::string cmdLine, istringstream& cmdArg, std::ostream& os ) } void ShellFunctions:: -cmdBeep( const std::string cmdLine, istringstream& cmdArg, std::ostream& os ) +cmdBeep( const std::string cmdLine, std::istringstream&, std::ostream& os ) { if( cmdLine == "help" ) {