--- a/src/simulator/timer-impl.h	Wed Oct 10 13:18:15 2007 +0200
+++ b/src/simulator/timer-impl.h	Wed Oct 10 13:30:35 2007 +0200
@@ -25,13 +25,6 @@
 
 namespace ns3 {
 
-template <typename T>
-struct TimerTraits
-{
-  typedef typename TypeTraits<typename TypeTraits<T>::ReferencedType>::NonConstType StoredType;
-  typedef const StoredType &ParameterType;
-};
-
 class TimerImpl
 {
 public:  
@@ -89,6 +82,15 @@
 };
 
 
+
+template <typename T>
+struct TimerTraits
+{
+  typedef typename TypeTraits<typename TypeTraits<T>::ReferencedType>::NonConstType StoredType;
+  typedef const StoredType &ParameterType;
+};
+
+
 template <typename FN>
 TimerImpl *
 MakeTimerImpl (FN fn)