--- a/src/core/composite-trace-resolver.cc	Sun Aug 12 22:23:08 2007 +0200
+++ b/src/core/composite-trace-resolver.cc	Sun Aug 12 22:24:45 2007 +0200
@@ -70,92 +70,6 @@
   DoAddSource (name, trace, TraceContext ());
 }
 
-
-void 
-CompositeTraceResolver::Add (std::string name,
-                             FVTraceSourceBase &trace)
-{
-  DoAddFV (name, trace, TraceContext ());
-}
-
-
-void 
-CompositeTraceResolver::DoAddFV (std::string name,
-                               FVTraceSourceBase &trace, 
-                               const TraceContext &context)
-{
-  class FVCompositeItem : public CompositeItem
-  {
-  public:
-    virtual void Connect (std::string subpath, const CallbackBase &cb, const TraceContext &context)
-    {if (subpath == "") {trace->AddCallback (cb, context);}}
-    virtual void Disconnect (std::string subpath, const CallbackBase &cb)
-    {if (subpath == "") {trace->RemoveCallback (cb);}}
-
-    FVTraceSourceBase *trace;
-  } *item = new FVCompositeItem ();
-  item->name = name;
-  item->context = context;
-  item->trace = &trace;
-  AddItem (item);
-}
-
-void 
-CompositeTraceResolver::Add (std::string name,
-                             UVTraceSourceBase &trace)
-{
-  DoAddUV (name, trace, TraceContext ());
-}
-
-
-void 
-CompositeTraceResolver::DoAddUV (std::string name,
-                                 UVTraceSourceBase &trace,
-                                 const TraceContext &context)
-{
-  class UVCompositeItem : public CompositeItem
-  {
-  public:
-    virtual void Connect (std::string subpath, const CallbackBase &cb, const TraceContext &context)
-    {if (subpath == "") {trace->AddCallback (cb, context);}}
-    virtual void Disconnect (std::string subpath, const CallbackBase &cb)
-    {if (subpath == "") {trace->RemoveCallback (cb);}}
-
-    UVTraceSourceBase *trace;
-  } *item = new UVCompositeItem ();
-  item->name = name;
-  item->context = context;
-  item->trace = &trace;
-  AddItem (item);
-}
-
-void
-CompositeTraceResolver::Add (std::string name,
-                             SVTraceSourceBase &trace)
-{
-  DoAddSV (name, trace, TraceContext ());
-}
-void
-CompositeTraceResolver::DoAddSV (std::string name,
-                                 SVTraceSourceBase &trace, 
-                                 const TraceContext &context)
-{
-  class SVCompositeItem : public CompositeItem
-  {
-  public:
-    virtual void Connect (std::string subpath, const CallbackBase &cb, const TraceContext &context)
-    {if (subpath == "") {trace->AddCallback (cb, context);}}
-    virtual void Disconnect (std::string subpath, const CallbackBase &cb)
-    {if (subpath == "") {trace->RemoveCallback (cb);}}
-
-    SVTraceSourceBase *trace;
-  } *item = new SVCompositeItem ();
-  item->name = name;
-  item->context = context;
-  item->trace = &trace;
-  AddItem (item);
-}
-
 void 
 CompositeTraceResolver::DoAddSource (std::string name,
                                      TraceSource &trace, 

--- a/src/core/composite-trace-resolver.h	Sun Aug 12 22:23:08 2007 +0200
+++ b/src/core/composite-trace-resolver.h	Sun Aug 12 22:24:45 2007 +0200
@@ -57,45 +57,6 @@
             TraceSource &trace, T const &context);
   /**
    * \param name name of trace source
-   * \param trace a signed variable trace source
-   * \param context the context associated to this trace source
-   *
-   * Add a signed variable trace source in this resolver. 
-   * This trace source will match the name specified during namespace 
-   * resolution. The TraceContext of this trace source will also
-   * be automatically extended to contain the input context.
-   */
-  template <typename T>
-  void Add (std::string name,
-            SVTraceSourceBase &trace, T const &context);
-  /**
-   * \param name name of trace source
-   * \param trace an unsigned variable trace source
-   * \param context the context associated to this trace source
-   *
-   * Add an unsigned variable trace source in this resolver. 
-   * This trace source will match the name specified during namespace 
-   * resolution. The TraceContext of this trace source will also
-   * be automatically extended to contain the input context.
-   */
-  template <typename T>
-  void Add (std::string name,
-            UVTraceSourceBase &trace, T const &context);
-  /**
-   * \param name name of trace source
-   * \param trace a floating-point variable trace source
-   * \param context the context associated to this trace source
-   *
-   * Add a floating-point variable trace source in this resolver. 
-   * This trace source will match the name specified during namespace 
-   * resolution. The TraceContext of this trace source will also
-   * be automatically extended to contain the input context.
-   */
-  template <typename T>
-  void Add (std::string name,
-            FVTraceSourceBase &trace, T const &context);
-  /**
-   * \param name name of trace source
    * \param trace a callback trace source
    *
    * Add a callback trace source in this resolver. This trace
@@ -105,36 +66,6 @@
   void Add (std::string name,
             TraceSource &trace);
   /**
-   * \param name name of trace source
-   * \param trace a signed variable trace source
-   *
-   * Add a signed variable trace source in this resolver. 
-   * This trace source will match the name specified during namespace 
-   * resolution.
-   */
-  void Add (std::string name,
-            SVTraceSourceBase &trace);
-  /**
-   * \param name name of trace source
-   * \param trace an unsigned variable trace source
-   *
-   * Add an unsigned variable trace source in this resolver. 
-   * This trace source will match the name specified during namespace 
-   * resolution.
-   */
-  void Add (std::string name,
-            UVTraceSourceBase &trace);
-  /**
-   * \param name name of trace source
-   * \param trace a floating-point variable trace source
-   *
-   * Add a floating-point variable trace source in this resolver. 
-   * This trace source will match the name specified during namespace 
-   * resolution.
-   */
-  void Add (std::string name,
-            FVTraceSourceBase &trace);
-  /**
    * \param name name of child trace resolver
    * \param createResolver a trace resolver constructor
    *
@@ -196,16 +127,6 @@
   void DoAddSource (std::string name,
                     TraceSource &trace,
                     const TraceContext &context);
-  void DoAddSV (std::string name,
-                SVTraceSourceBase &trace, 
-                const TraceContext &context);
-  void DoAddUV (std::string name,
-                UVTraceSourceBase &trace,
-                const TraceContext &context);
-  void DoAddFV (std::string name,
-                FVTraceSourceBase &trace,
-                const TraceContext &context);
-
 
   CompositeTraceResolver::TraceItems m_items;
   Ptr<TraceResolver> m_parent;
@@ -228,34 +149,6 @@
   DoAddSource (name, trace, ctx);  
 }
 
-template <typename T>
-void 
-CompositeTraceResolver::Add (std::string name,
-                             SVTraceSourceBase &trace, T const &context)
-{
-  TraceContext ctx;
-  ctx.Add (context);
-  DoAddSV (name, trace, ctx);  
-}
-template <typename T>
-void 
-CompositeTraceResolver::Add (std::string name,
-                             UVTraceSourceBase &trace, T const &context)
-{
-  TraceContext ctx;
-  ctx.Add (context);
-  DoAddUV (name, trace, ctx);
-}
-template <typename T>
-void 
-CompositeTraceResolver::Add (std::string name,
-                             FVTraceSourceBase &trace, T const &context)
-{
-  TraceContext ctx;
-  ctx.Add (context);
-  DoAddFV (name, trace, ctx);
-}
-
 template <typename ITERATOR, typename INDEX>
 void 
 CompositeTraceResolver::AddArray (std::string name,