X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FLog.hh;h=324fdeed8555b0c747c1fd8eecacae903496cac7;hp=c7ee50726b68e35ea914b81afa9c95fc4c347687;hb=c78934a448d0126709fccec3d5a636b3baa87da4;hpb=7f3984f3f9524f5b6813e01ceb2fe576dadff94e

diff --git a/src/Moof/Log.hh b/src/Moof/Log.hh
index c7ee507..324fdee 100644
--- a/src/Moof/Log.hh
+++ b/src/Moof/Log.hh
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- 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.
- 
- 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 HOLDER 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.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #ifndef _MOOF_LOG_H_
 #define _MOOF_LOG_H_
@@ -32,8 +15,8 @@
 /**
  * @file log.h
  * Functions related to logging the process.
- * The logging functions are logError(), logWarning(), logInfo(), and
- * logDebug(), listed from most critical to least critical.
+ * The logging functions are logError(), logWarning(), and logInfo(),
+ * listed from most critical to least critical.
  */
 
 #include <cstdlib>		// exit
@@ -41,7 +24,8 @@
 
 
 /**
- * Macro which tests an assertion and issues an logError() and exits if false.
+ * Macro which tests an assertion and issues an logError() and exits if
+ * false.
  * @param X test to perform
  */
 
@@ -50,8 +34,9 @@
 #if NDEBUG
 #define ASSERT(X)
 #else
-#define ASSERT(X) if (!(X)) Mf::logError << \
-	"false assertion at " << __FILE__ << ":" << __LINE__ << ", " << #X, exit(1)
+#define ASSERT(X) if (!(X)) Mf::logError \
+	<< "false assertion at " << __FILE__ << ":" << __LINE__ << ", " \
+	<< #X, exit(1)
 #endif
 
 
@@ -64,12 +49,10 @@ public:
 
 	enum Level
 	{
-		NONE		= -1,		///< Disable all logging.
-		ERRORR		=  1,		///< Log only errors.
-		WARNING		=  2,		///< Log warnings and errors.
-		SCRIPT		=  3,		///< Log messages from Lua, too.
-		INFO		=  4,		///< Log info, warnings, errors.
-		DEBUGG		=  5,		///< Log all messages.
+		NONE		= 0,		///< Disable all logging.
+		ERRORR		= 1,		///< Log only errors.
+		WARNING		= 2,		///< Log warnings and errors.
+		INFO		= 3,		///< Log everything.
 	};
 
 	static void setLevel(Level level);
@@ -81,7 +64,7 @@ public:
 		mType(type) /* only pass literal strings */ {}
 
 
-	template <typename T>
+	template <class T>
 	void operator () (const T& item)
 	{
 		*this << item << std::endl;
@@ -89,7 +72,7 @@ public:
 
 private:
 
-	template <typename T> friend std::ostream& operator << (Log&, const T&);
+	template <class T> friend std::ostream& operator << (Log&, const T&);
 
 	static Level	gLevel;
 
@@ -104,10 +87,9 @@ extern std::ostream&	nullLog;
 extern Log logError;
 extern Log logWarning;
 extern Log logInfo;
-extern Log logDebug;
 
 
-template <typename T>
+template <class T>
 inline std::ostream& operator << (Log& logObj, const T& item)
 {
 	if (Log::gLevel < logObj.mLevel) return nullLog;
@@ -116,7 +98,7 @@ inline std::ostream& operator << (Log& logObj, const T& item)
 
 
 class Script;
-void importLogPrintFunction(Script& script);
+void importLogFunctions(Script& script);
 
 
 } // namespace Mf