X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fframework.h;h=1c9a1c1d5ff2e2dc1eabdb26fbcc8c0c129f51d2;hb=b0ef8cb4b2a4056fc7df7c16aa6a170edb4dea34;hp=7a58cbeeb94cef276c424af3f94a304772ee651c;hpb=ecc7382f48857cb22e74ffa9496f9a31e956bde3;p=awesomized%2Flibmemcached

diff --git a/libtest/framework.h b/libtest/framework.h
index 7a58cbee..1c9a1c1d 100644
--- a/libtest/framework.h
+++ b/libtest/framework.h
@@ -1,9 +1,40 @@
-/* uTest Copyright (C) 2011 Data Differential, http://datadifferential.com/
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  uTest, libtest
+ *
+ *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * Use and distribution licensed under the BSD license.  See
- * the COPYING file in the parent directory for full text.
  */
 
+
 #pragma once
 
 /**
@@ -19,17 +50,7 @@ struct Framework {
   test_callback_create_fn *_create;
   test_callback_fn *_destroy;
 
-  void* create(test_return_t* arg)
-  {
-    if (_create)
-    {
-      return _create(arg);
-    }
-
-    return NULL;
-  }
-
-  test_return_t destroy(void*);
+  void* create(test_return_t& arg);
 
   /* This is called a the beginning of any collection run. */
   test_callback_fn *collection_startup;
@@ -127,11 +148,11 @@ struct Framework {
 
   Framework();
 
-  virtual ~Framework()
-  { }
+  virtual ~Framework();
 
   Framework(const Framework&);
 
 private:
   Framework& operator=(const Framework&);
+  void *_creators_ptr;
 };