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

Removed all using namespace directives from headers. Some minor resulting bugfixes.

parent 5242f454
No related branches found
No related tags found
No related merge requests found
...@@ -2,18 +2,16 @@ ...@@ -2,18 +2,16 @@
* all-signals.h * all-signals.h
* *
* Created on: Jun 16, 2010 * Created on: Jun 16, 2010
* Author: blue * Author: Francois Bleibel
*/ */
#ifndef ALLSIGNALS_H_ #ifndef ALLSIGNALS_H_
#define ALLSIGNALS_H_ #define ALLSIGNALS_H_
/// Utility header files including all signals and using namespace dynamicgraph /// Utility header files including all signal headers
#include <dynamic-graph/signal.h> #include <dynamic-graph/signal.h>
#include <dynamic-graph/signal-ptr.h> #include <dynamic-graph/signal-ptr.h>
#include <dynamic-graph/signal-time-dependant.h> #include <dynamic-graph/signal-time-dependant.h>
using namespace dynamicgraph;
#endif /* ALLSIGNALS_H_ */ #endif /* ALLSIGNALS_H_ */
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* SignalCaster.h * SignalCaster.h
* *
* Created on: Jun 14, 2010 * Created on: Jun 14, 2010
* Author: blue * Author: Francois Bleibel
*/ */
#ifndef SIGNALCASTER_H_ #ifndef SIGNALCASTER_H_
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#define VP_TEMPLATE_DEBUG_MODE 0 #define VP_TEMPLATE_DEBUG_MODE 0
#include <dynamic-graph/debug.h> #include <dynamic-graph/debug.h>
using namespace dynamicgraph; namespace dynamicgraph {
template< class T,class Time > template< class T,class Time >
bool SignalPtr<T,Time>:: bool SignalPtr<T,Time>::
...@@ -262,6 +262,7 @@ displayDependancies( std::ostream& os,const int depth, ...@@ -262,6 +262,7 @@ displayDependancies( std::ostream& os,const int depth,
return os; return os;
} }
} // namespace dynamicgraph
#endif // #ifndef __SIGNAL_PTR_TCPP #endif // #ifndef __SIGNAL_PTR_TCPP
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#define VP_TEMPLATE_DEBUG_MODE 0 #define VP_TEMPLATE_DEBUG_MODE 0
#include <dynamic-graph/debug.h> #include <dynamic-graph/debug.h>
using namespace dynamicgraph; namespace dynamicgraph {
#define __SIGNAL_INIT(name,Tcpy,Tref,TrefNC,mutex) \ #define __SIGNAL_INIT(name,Tcpy,Tref,TrefNC,mutex) \
SignalBase<Time>(name) \ SignalBase<Time>(name) \
...@@ -327,6 +327,8 @@ display (std::ostream& os) const ...@@ -327,6 +327,8 @@ display (std::ostream& os) const
return os<<")"; return os<<")";
} }
} // namespace dynamicgraph
#endif // #ifndef __SIGNAL_TEMPLATE #endif // #ifndef __SIGNAL_TEMPLATE
/* /*
......
...@@ -29,6 +29,9 @@ ...@@ -29,6 +29,9 @@
#include <dynamic-graph/signal-base.h> #include <dynamic-graph/signal-base.h>
#include <dynamic-graph/signal-array.h> #include <dynamic-graph/signal-array.h>
namespace dynamicgraph {
template< class Time > template< class Time >
class TimeDependancy class TimeDependancy
{ {
...@@ -90,6 +93,9 @@ class TimeDependancy ...@@ -90,6 +93,9 @@ class TimeDependancy
}; };
} // namespace dynamicgraph
#include <dynamic-graph/time-dependency.t.cpp> #include <dynamic-graph/time-dependency.t.cpp>
#endif /* #ifndef __TIME_DEPENDANCY_HH */ #endif /* #ifndef __TIME_DEPENDANCY_HH */
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <dynamic-graph/time-dependency.h> #include <dynamic-graph/time-dependency.h>
using namespace dynamicgraph; namespace dynamicgraph {
#undef VP_TEMPLATE_DEBUG_MODE #undef VP_TEMPLATE_DEBUG_MODE
#define VP_TEMPLATE_DEBUG_MODE 0 #define VP_TEMPLATE_DEBUG_MODE 0
...@@ -176,7 +176,7 @@ displayDependancies( std::ostream& os,const int depth, ...@@ -176,7 +176,7 @@ displayDependancies( std::ostream& os,const int depth,
return os; return os;
} }
} // namespace dynamicgraph
#endif /* #ifndef __TIME_DEPENDANCY_TCPP */ #endif /* #ifndef __TIME_DEPENDANCY_TCPP */
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <string> #include <string>
using namespace std; using namespace std;
using namespace dynamicgraph;
......
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