Merge

[m6w6/libmemcached] / libtest / strerror.h

diff --git a/libtest/strerror.h b/libtest/strerror.h
index 2d6e6536a980af06433cde6fb3bc7e1feaad66c1..7dc3cf5ecc97e755b0db9ba52a459797778dd92d 100644 (file)
--- a/libtest/strerror.h
+++ b/libtest/strerror.h
@@ -1,14 +1,39 @@
-/* 
- * uTest Copyright (C) 2011 Data Differential, http://datadifferential.com/
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  libtest
  *
- * Use and distribution licensed under the BSD license.  See
- * the COPYING file in the parent directory for full text.
+ *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 3 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #pragma once
 
+#include <vector>
+#include <iostream>
+
+namespace libtest {
+
 /**
   @note Friendly print function for errors.
 */
 LIBTEST_API
 const char *test_strerror(test_return_t code);
+
+} // namespace libtest
+
+std::ostream& operator<<(std::ostream& output, const enum test_return_t &arg);
+std::ostream& operator<<(std::ostream& output, const std::vector<char> &arg);
+