Merge in updated yatl.

[awesomized/libmemcached] / libtest / framework.cc

diff --git a/libtest/framework.cc b/libtest/framework.cc
index 327c2c0de4ae65b827ec8fe340d045826e546327..9fef09b2485e18ed401b2a112be7c0fa27961f44 100644 (file)
--- a/libtest/framework.cc
+++ b/libtest/framework.cc
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "libtest/yatlcon.h"
 
 #include <libtest/common.h>
 #include <libtest/collection.h>
@@ -45,7 +45,7 @@
 
 namespace libtest {
 
-Framework::Framework(libtest::SignalThread& signal,
+Framework::Framework(libtest::SignalThread& signal_,
                      const std::string& name_,
                      const std::string& only_run_arg,
                      const std::string& wildcard_arg) :
@@ -59,7 +59,7 @@ Framework::Framework(libtest::SignalThread& signal,
   _runner(NULL),
   _socket(false),
   _creators_ptr(NULL),
-  _signal(signal),
+  _signal(signal_),
   _only_run(only_run_arg),
   _wildcard(wildcard_arg),
   _name(name_)