yake-svn Mailing List for Yake Engine (Page 20)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1562
          http://svn.sourceforge.net/yake/?rev=1562&view=rev
Author:   psyclonist
Date:     2006-12-19 12:17:53 -0800 (Tue, 19 Dec 2006)

Log Message:
-----------
refacted logging interface,
added sampleLog,
removed deprecated code,
added native::getCurrentThreadId()

Modified Paths:
--------------
    trunk/yake/scripts/premake/samples.lua
    trunk/yake/src/base/yakeLog.cpp
    trunk/yake/yake/base/native/yakeNative.h
    trunk/yake/yake/base/prerequisites/yakePrerequisitesVC71Warnings.h
    trunk/yake/yake/base/prerequisites/yakePrerequisitesVC8Warnings.h
    trunk/yake/yake/base/yakeLog.h

Added Paths:
-----------
    trunk/yake/samples/sampleLog/
    trunk/yake/samples/sampleLog/demo.cpp
    trunk/yake/src/base/native/win32/yakeThreads.cpp

Removed Paths:
-------------
    trunk/yake/src/base/yakeDebugLogAppender.cpp
    trunk/yake/yake/base/yakeDebugLogAppender.h

Added: trunk/yake/samples/sampleLog/demo.cpp
===================================================================

--- trunk/yake/samples/sampleLog/demo.cpp	                        (rev 0)
+++ trunk/yake/samples/sampleLog/demo.cpp	2006-12-19 20:17:53 UTC (rev 1562)
@@ -0,0 +1,25 @@
+#include "yake/base/yake.h"
+
+using namespace yake;
+
+int main(int argc, char* argv[])
+{
+	try
+	{
+		yake::logging::setProcessId("demo");
+		YAKE_LOG_INFORMATION("aloha");
+		YAKE_LOG_WARNING("aloha");
+		yake::logging::log( yake::logging::S_ERROR, "Batman, help! ", 42 );
+	}
+	catch (yake::Exception& ex)
+	{
+		std::cout << "Demo caught exception: \n" << ex.what();
+	}
+#if defined(YAKE_DEBUG)
+	{
+		std::cout << "\nPress ENTER...\n";
+		std::cin.get();
+	}
+#endif
+}
+

Modified: trunk/yake/scripts/premake/samples.lua
===================================================================
--- trunk/yake/scripts/premake/samples.lua	2006-12-19 00:31:15 UTC (rev 1561)
+++ trunk/yake/scripts/premake/samples.lua	2006-12-19 20:17:53 UTC (rev 1562)
@@ -33,6 +33,10 @@
 --------------------------------------
 
 --------------------------------------
+makeSample("sampleLog","samples/sampleLog")
+useComponent("base")
+
+--------------------------------------
 makeSample("sampleEntFsm","samples/ent/sampleEntFsm")
 useComponent("base")
 useComponent("scripting")

Added: trunk/yake/src/base/native/win32/yakeThreads.cpp
===================================================================
--- trunk/yake/src/base/native/win32/yakeThreads.cpp	                        (rev 0)
+++ trunk/yake/src/base/native/win32/yakeThreads.cpp	2006-12-19 20:17:53 UTC (rev 1562)
@@ -0,0 +1,49 @@
+/*
+   ------------------------------------------------------------------------------------
+   This file is part of YAKE
+   Copyright \xA9 2004 The YAKE Team
+   For the latest information visit http://www.yake.org
+   ------------------------------------------------------------------------------------
+   This program 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 2 of the License, or (at your option) any later
+   version.
+
+   This program 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 program; if not, write to the Free Software Foundation, Inc., 59 Temple
+   Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+   http://www.gnu.org/copyleft/lesser.txt.
+   ------------------------------------------------------------------------------------
+   If you are interested in another license model contact the Yake Team via
+   E-Mail: te...@ya....
+   For more information see the LICENSE file in the root directory of the
+   source code distribution.
+   ------------------------------------------------------------------------------------
+*/
+
+//============================================================================
+//    IMPLEMENTATION HEADERS
+//============================================================================
+// stl
+#include <cassert>
+#include <locale>
+// yake
+#include <yake/base/yakePCH.h>
+#include <yake/base/native/win32/yakeConfig.h>
+#include <yake/base/templates/yakeSmartAssert.h>
+#include <yake/base/yakeException.h>
+
+namespace yake {
+namespace native {
+
+	threadid_t getCurrentThreadId()
+	{
+		return ::GetCurrentThreadId();
+	}
+
+} // native
+} // yake

Deleted: trunk/yake/src/base/yakeDebugLogAppender.cpp
===================================================================
--- trunk/yake/src/base/yakeDebugLogAppender.cpp	2006-12-19 00:31:15 UTC (rev 1561)
+++ trunk/yake/src/base/yakeDebugLogAppender.cpp	2006-12-19 20:17:53 UTC (rev 1562)
@@ -1,55 +0,0 @@
-/*
-   ------------------------------------------------------------------------------------
-   This file is part of YAKE
-   Copyright  2004 The YAKE Team
-   For the latest information visit http://www.yake.org 
-   ------------------------------------------------------------------------------------
-   This program 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 2 of the License, or (at your option) any later
-   version.
-
-   This program 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 program; if not, write to the Free Software Foundation, Inc., 59 Temple
-   Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-   http://www.gnu.org/copyleft/lesser.txt.
-   ------------------------------------------------------------------------------------
-   If you are interested in another license model contact the Yake Team via
-   E-Mail: te...@ya....
-   For more information see the LICENSE file in the root directory of the
-   source code distribution.
-   ------------------------------------------------------------------------------------
-*/
-
-//============================================================================
-//    IMPLEMENTATION HEADERS
-//============================================================================
-#include <yake/base/yakePCH.h>
-#include <yake/base/yakeDebugLogAppender.h>
-#include <yake/base/native/yakeNative.h>
-
-//============================================================================
-//    INTERFACE STRUCTURES / UTILITY CLASSES
-//============================================================================
-namespace yake
-{
-namespace base
-{
-	void DebugLogAppender::onLog( const Log::Message& message )
-	{
-		static native::DebugLog::Severity severityTranslationTable[] =
-		{
-			native::DebugLog::INFORMATIONS,
-			native::DebugLog::WARNINGS,
-			native::DebugLog::ERRORS
-		};
-
-		native::debug_Log( message.text.c_str(), severityTranslationTable[ message.severity ], message.source.c_str() );
-	}
-} // base
-} // yake
-

Modified: trunk/yake/src/base/yakeLog.cpp
===================================================================
--- trunk/yake/src/base/yakeLog.cpp	2006-12-19 00:31:15 UTC (rev 1561)
+++ trunk/yake/src/base/yakeLog.cpp	2006-12-19 20:17:53 UTC (rev 1562)
@@ -24,64 +24,96 @@
    source code distribution.
    ------------------------------------------------------------------------------------
 */
-//============================================================================
-//    IMPLEMENTATION HEADERS
-//============================================================================
 #include <yake/base/yakePCH.h>
 #include <yake/base/yakeLog.h>
-#include <yake/base/yakeDebugLogAppender.h>
 
-//============================================================================
-//    INTERFACE STRUCTURES / UTILITY CLASSES
-//============================================================================
-namespace yake
-{
-namespace base
-{
+namespace yake {
+namespace logging {
+	void toStdErr(const severity_t sev, const char* procId, threadid_t threadId, const char* msg)
+	{
+		std::ostringstream ss;
+		ss << "[" << (procId ? procId : "") << "]";
 
-Log::Log()
-{
-#ifdef YAKE_DEBUG_BUILD
-	mOnLog.connect( &DebugLogAppender::onLog );
-#endif
-}
+		ss << "[thread:";
+		ss << std::hex << threadId;
+		ss << "] ";
 
-Log::~Log()
-{
-}
+		ss << "[";
+		ss << toString(Severity(sev));
+		if (sev >= S_LAST)
+			ss << "(" << severity_t(sev) << ")";
+		ss << "]";
+		ss << "\t" << msg << "\n";
 
-void Log::onLog( const OnLog::slot_type& rSlot )
-{
-  mOnLog.connect( rSlot );
-}
+		std::cerr << ss.str();
+	}
 
-void Log::log( const String& rWhat,
-					Severity severity,
-					const String& rSource,
-					const String& rAdditionalInfo )
-{
-	mOnLog( Message( rWhat, severity, rSource, rAdditionalInfo ) );
-}
+	const char* toString(const Severity sev)
+	{
+		static char* severity_names[S_LAST+1] =
+		{
+			"emergency",
+			"alert",
+			"critical",
+			"error",
+			"warning",
+			"notice",
+			"information",
+			"debug",
+			"custom"
+		};
+		return (sev <= S_DEBUG) ? severity_names[sev] : severity_names[S_LAST];
+	}
+	logger::scoped_lock::scoped_lock() : lck_(instance_.mtx_)
+	{
+	}
+	logger logger::instance_;
+	logger& logger::instance()
+	{
+		return instance_;
+	}
+	void logger::enableSeverity(const severity_t sev, const bool on)
+	{
+		scoped_lock lock;
+		instance().enabledSeverities_[ sev ] = on;
+	}
+	int logger::addTarget(const LogFn fn)
+	{
+		scoped_lock lock;
+		instance().targets_.push_back( fn );
+		return 1;
+	}
+	void logger::log(const severity_t sev, const char *tid, const char *msg)
+	{
+		instance().doLog(sev, tid, msg);
+	}
+	void logger::doLog(const severity_t sev, const char *tid, const char *msg)
+	{
+		scoped_lock lock;
 
-void log_information( const String& what, const String& source, const String& where )
-{
-	Log::instance().log( what, Log::INFORMATIONS, source, where );
-}
+		EnableMap::const_iterator itEnabled = instance_.enabledSeverities_.find( sev );
+		if (itEnabled != instance_.enabledSeverities_.end() && !itEnabled->second)
+			return;
 
-void log_warning( const String& what, const String& source, const String& where )
-{
-	Log::instance().log( what, Log::WARNINGS, source, where );
-}
+		TargetFnList::const_iterator itEnd = targets_.end();
+		for (TargetFnList::const_iterator it = targets_.begin(); it != itEnd; ++it)
+		{
+			const threadid_t threadId = native::getCurrentThreadId();
+			(**it)(sev,instance().procId_.c_str(),threadId,msg);
+		}
+	}
+	void logger::setProcessId(const String& pId)
+	{
+		scoped_lock lock;
+		instance().procId_ = pId;
+	}
+	logger::logger()
+	{
+		scoped_lock lock;
+		for (severity_t i=0; i<S_LAST; ++i)
+			enableSeverity( i, true );
+		addTarget(&toStdErr);
+	}
 
-void log_error( const String& what, const String& source, const String& where )
-{
-	Log::instance().log( what, Log::ERRORS, source, where );
-}
-
-void log( const String& what )
-{
-	Log::instance().log( what );
-}
-
-} // base
+} // logging
 } // yake

Modified: trunk/yake/yake/base/native/yakeNative.h
===================================================================
--- trunk/yake/yake/base/native/yakeNative.h	2006-12-19 00:31:15 UTC (rev 1561)
+++ trunk/yake/yake/base/native/yakeNative.h	2006-12-19 20:17:53 UTC (rev 1562)
@@ -34,6 +34,7 @@
 //============================================================================
 
 namespace yake {
+	typedef uint32 threadid_t;
 namespace native {
 
 	// Library Interface.
@@ -72,6 +73,8 @@
 	// Application Information Interface.
 	YAKE_BASE_API const char* getApplicationDir();
 
+	YAKE_BASE_API threadid_t getCurrentThreadId();
+
 } // native
 } // yake
 

Modified: trunk/yake/yake/base/prerequisites/yakePrerequisitesVC71Warnings.h
===================================================================
--- trunk/yake/yake/base/prerequisites/yakePrerequisitesVC71Warnings.h	2006-12-19 00:31:15 UTC (rev 1561)
+++ trunk/yake/yake/base/prerequisites/yakePrerequisitesVC71Warnings.h	2006-12-19 20:17:53 UTC (rev 1562)
@@ -44,6 +44,9 @@
 // A base class or structure must be declared with the __declspec(dllexport) keyword for a function in a derived class to be exported
 #pragma warning( disable : 4251 )
 
+// C4275: non dll-interface class 'X' used as base for dll-interface 'Y'
+#pragma warning(disable: 4275)
+
 // Turn off 'warning C4355: 'this' : used in base member initializer list'
 #pragma warning( disable : 4355 )
 

Modified: trunk/yake/yake/base/prerequisites/yakePrerequisitesVC8Warnings.h
===================================================================
--- trunk/yake/yake/base/prerequisites/yakePrerequisitesVC8Warnings.h	2006-12-19 00:31:15 UTC (rev 1561)
+++ trunk/yake/yake/base/prerequisites/yakePrerequisitesVC8Warnings.h	2006-12-19 20:17:53 UTC (rev 1562)
@@ -44,6 +44,9 @@
 // A base class or structure must be declared with the __declspec(dllexport) keyword for a function in a derived class to be exported
 #pragma warning( disable : 4251 )
 
+// C4275: non dll-interface class 'X' used as base for dll-interface 'Y'
+#pragma warning(disable: 4275)
+
 // Turn off 'warning C4355: 'this' : used in base member initializer list'
 #pragma warning( disable : 4355 )
 

Deleted: trunk/yake/yake/base/yakeDebugLogAppender.h
===================================================================
--- trunk/yake/yake/base/yakeDebugLogAppender.h	2006-12-19 00:31:15 UTC (rev 1561)
+++ trunk/yake/yake/base/yakeDebugLogAppender.h	2006-12-19 20:17:53 UTC (rev 1562)
@@ -1,60 +0,0 @@
-/*
-   ------------------------------------------------------------------------------------
-   This file is part of YAKE
-   Copyright  2004 The YAKE Team
-   For the latest information visit http://www.yake.org 
-   ------------------------------------------------------------------------------------
-   This program 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 2 of the License, or (at your option) any later
-   version.
-
-   This program 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 program; if not, write to the Free Software Foundation, Inc., 59 Temple
-   Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-   http://www.gnu.org/copyleft/lesser.txt.
-   ------------------------------------------------------------------------------------
-   If you are interested in another license model contact the Yake Team via
-   E-Mail: te...@ya....
-   For more information see the LICENSE file in the root directory of the
-   source code distribution.
-   ------------------------------------------------------------------------------------
-*/
-#ifndef YAKE_BASE_DEBUGLOGTARGET_H
-#define YAKE_BASE_DEBUGLOGTARGET_H
-
-//============================================================================
-//    IMPLEMENTATION HEADERS
-//============================================================================
-// Standard headers
-#ifndef YAKE_BASE_PREREQUISITES_H
-#	include "yake/base/yakePrerequisites.h"
-#endif
-// Yake
-#include <yake/base/yakeString.h>
-#include <yake/base/yakeLog.h>
-
-//============================================================================
-//    INTERFACE STRUCTURES / UTILITY CLASSES
-//============================================================================
-namespace yake
-{
-namespace base
-{
-
-class YAKE_BASE_API DebugLogAppender
-{
-// Methods
-public:
-	static void onLog( const Log::Message& );
-};
-
-} // base
-} // yake
-
-#endif // YAKE_BASE_DEBUGLOGTARGET_H
-

Modified: trunk/yake/yake/base/yakeLog.h
===================================================================
--- trunk/yake/yake/base/yakeLog.h	2006-12-19 00:31:15 UTC (rev 1561)
+++ trunk/yake/yake/base/yakeLog.h	2006-12-19 20:17:53 UTC (rev 1562)
@@ -24,126 +24,152 @@
    source code distribution.
    ------------------------------------------------------------------------------------
 */
-#ifndef YAKE_BASE_LOG_H
-#define YAKE_BASE_LOG_H
+#ifndef YAKE_LOGGING_LOG_H
+#define YAKE_LOGGING_LOG_H
 
-//============================================================================
-//    IMPLEMENTATION HEADERS
-//============================================================================
-// Standard headers
 #ifndef YAKE_BASE_PREREQUISITES_H
 #	include "yake/base/yakePrerequisites.h"
 #endif
-// Yake
+#include <yake/base/yakeNoncopyable.h>
 #include <yake/base/yakeString.h>
 #include <yake/base/templates/yakeSingleton.h>
-#include <yake/base/templates/yakeSignals.h>
 
-//============================================================================
-//    INTERFACE STRUCTURES / UTILITY CLASSES
-//============================================================================
-namespace yake
-{
-namespace base
-{
+#include <yake/base/native/yakeNative.h>
+#include <boost/thread/mutex.hpp>
 
-class YAKE_BASE_API Log
-{
-// Types
-public:
-	enum Severity { INFORMATIONS, WARNINGS, ERRORS };
-	
-	/**
-	 * Class representing log message.
-	*/
-	struct Message
+namespace yake {
+namespace logging {
+
+	// syslog inspired
+	enum Severity
 	{
-		/// Log message text.
-		String		text;
-		
-		/// Message severity.
-		Severity		severity;
-		
-		/// Message source, like "kernel" or "module X".
-		String		source;
-		
-		/// Any additional info, like "file foo.cpp, line 666".
-		String		additionalInfo;
-		
-		Message( 
-				const String& msgText,
-				Severity msgSeverity,
-				const String& msgSrc,
-				const String& msgInfo ):	text( msgText ),
-													severity( msgSeverity ),
-													source( msgSrc ),
-													additionalInfo( msgInfo )
-		{
-		}
+		S_EMERGENCY = 0,
+		S_ALERT,
+		S_CRITICAL,
+		S_ERROR,
+		S_WARNING,
+		S_NOTICE,
+		S_INFORMATION,
+		S_DEBUG,
+		S_LAST // Do not use directly.
 	};
-	
-	/// Log signal type.
-	typedef Signal3< void (const Message&) > OnLog;
+	typedef uint32 severity_t;
 
-// Class
-public:
-	Log();
-	virtual ~Log();
+	//helper:
+	YAKE_BASE_API const char* toString(const Severity sev);
 
-// Methods
-public:
-	/// Subscribe to log messages.
-	void onLog( const OnLog::slot_type& rSlot );
-	
-	/// Log message.
-	void log( const String& rWhat,
-				 Severity severity = INFORMATIONS, 
-				 const String& rSource = "yake", 
-				 const String& rAdditionalInfo = "" );
-//deprecated method: for rich typesafe formatting use boost::format library
-//void logPrintf(char *fmt, ...); // todo: remove this <= Er.. no!
+	/** severity, processId, threadId, message */
+	typedef void(*LogFn)(const severity_t, const char*, threadid_t, const char*);
+	struct YAKE_BASE_API logger : public boost::noncopyable
+	{
+		//YAKE_BUILD_PHOENIX_SINGLETON(logger) //public
+	private: //Make it private if PHOENIX is not used!
+		logger();
+		static logger& instance();
+		static logger instance_;
+	public:
+		static void log(const severity_t, const char* tid, const char* msg);
+		static void setProcessId(const String&);
+		static int addTarget(const LogFn);
+		static void enableSeverity(const severity_t, const bool);
+	private:
+		void doLog(const severity_t, const char* tid, const char* msg);
+	private:
+		String			procId_;
+		typedef std::vector<LogFn> TargetFnList;
+		TargetFnList	targets_;
+		typedef std::map<severity_t,bool> EnableMap;
+		EnableMap		enabledSeverities_;
+		boost::mutex	mtx_;
+		struct scoped_lock;
+		friend struct scoped_lock;
+		struct scoped_lock : public boost::noncopyable
+		{
+			scoped_lock();
+		private:
+			boost::mutex::scoped_lock	lck_;
+		};
+	};
 
-// Data
-private:
-	/// Log signal itself.
-	OnLog mOnLog;
+	////////////////
+#if defined(LOG_WITH_TYPE)
+#	define LOG_TYPE(X) typeid(X).name() << "(" << X << ")"
+#else
+#	define LOG_TYPE(X) X
+#endif
 
-	YAKE_BUILD_PHOENIX_SINGLETON(Log)
-};
+	template<typename T1>
+	inline void log(const severity_t sev, const T1& rhs)
+	{
+		std::stringstream ss;
+		ss << LOG_TYPE(rhs);
+		logger::log(sev, "[threadid]", ss.str().c_str());
+	}
+	template<typename T1, typename T2>
+	inline void log(const severity_t sev, const T1& rhs1, const T2& rhs2)
+	{
+		std::stringstream ss;
+		ss << LOG_TYPE(rhs1);
+		ss << LOG_TYPE(rhs2);
+		logger::log(sev, "[threadid]", ss.str().c_str());
+	}
+	template<typename T1, typename T2, typename T3>
+	inline void log(const severity_t sev, const T1& rhs1, const T2& rhs2, const T3& rhs3)
+	{
+		std::stringstream ss;
+		ss << LOG_TYPE(rhs1);
+		ss << LOG_TYPE(rhs2);
+		ss << LOG_TYPE(rhs3);
+		logger::log(sev, "[threadid]", ss.str().c_str());
+	}
 
-void YAKE_BASE_API log_information( const String& what, const String& source, const String& where );
-void YAKE_BASE_API log_warning( const String& what, const String& source, const String& where );
-void YAKE_BASE_API log_error( const String& what, const String& source, const String& where );
+	// short cuts
+	inline void setProcessId(const String& procId)
+	{
+		logger::setProcessId(procId);
+	}
+	inline void enableSeverity(const severity_t sev, const bool on)
+	{
+		logger::enableSeverity(sev,on);
+	}
+	inline void addTarget(const LogFn fn)
+	{
+		logger::addTarget(fn);
+	}
 
-// the simplest form of logging. Adds nothing to "what".
-// Useful in scripts where you just want to log something without "where"
-void YAKE_BASE_API log( const String& what );
-
-// todo: printf sucks <= no it doesn't! <= IT DOES, use boost::format for
-// typesafe string formatting
-
-// some preprocessor magic for __LINE__ stringification
-// Unfortunately it doesn't produce correct results on VC7.1.
-#define STRINGIFY(x) #x
-#if YAKE_PLATFORM == PLATFORM_WIN32
-	inline String TOSTRING2FN(int i)
+	// helper stream operators
+	inline std::ostream& operator << (std::ostream& out, const std::exception& rhs)
 	{
-		std::stringstream ss;
-		ss << i;
-		return String( ss.str().c_str() );
+		out << "std::exception('" << rhs.what() << "')";
+		return out;
 	}
-#	define TOSTRING(x) +::yake::base::TOSTRING2FN(x)
-#else
-#	define TOSTRING(x) STRINGIFY (x)
-#endif
 
-#define YAKE_LOG_INFORMATION( what ) yake::base::log_information( what, "yake", "File: "__FILE__"@"TOSTRING(__LINE__) );
-#define YAKE_LOG_WARNING( what ) yake::base::log_warning( what, "yake", "File: "__FILE__"@"TOSTRING(__LINE__) );
-#define YAKE_LOG_ERROR( what ) yake::base::log_error( what, "yake", "File: "__FILE__"@"TOSTRING(__LINE__) );
-#define YAKE_LOG( what ) yake::base::log_information( what, "yake", "File: "__FILE__"@"TOSTRING(__LINE__) );
+	/////////////////
+	// Compatibility
+	// @todo remove in 0.7.x
 
-} // base
-} // yake
+	// some preprocessor magic for __LINE__ stringification
+	// Unfortunately it doesn't produce correct results on VC7.1.
+	#define STRINGIFY(x) #x
+	#if YAKE_PLATFORM == PLATFORM_WIN32
+		inline String TOSTRING2FN(int i)
+		{
+			std::stringstream ss;
+			ss << i;
+			return String( ss.str().c_str() );
+		}
+	#	define TOSTRING(x) +::yake::logging::TOSTRING2FN(x)
+	#else
+	#	define TOSTRING(x) STRINGIFY (x)
+	#endif
 
-#endif // YAKE_BASE_LOG_H
+	#define YAKE_LOG_INFORMATION( what ) yake::logging::log( yake::logging::S_INFORMATION, "[File: "__FILE__"@"TOSTRING(__LINE__)+"] ", what );
+	#define YAKE_LOG_WARNING( what ) yake::logging::log( yake::logging::S_WARNING, "[File: "__FILE__"@"TOSTRING(__LINE__)+"] ", what );
+	#define YAKE_LOG_ERROR( what ) yake::logging::log( yake::logging::S_ERROR, "[File: "__FILE__"@"TOSTRING(__LINE__)+"] ", what );
+	#define YAKE_LOG( what ) yake::logging::log::log_information( yake::logging::S_INFORMATION, "[File: "__FILE__"@"TOSTRING(__LINE__)+"] ", what );
 
+} // namespace logging
+} // namespace yake
+
+#endif // YAKE_LOGGING_LOG_H
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (17)	Sep (51)	Oct (2)	Nov (18)	Dec (66)
2007	Jan (44)	Feb (13)	Mar (73)	Apr (61)	May	Jun (4)	Jul (19)	Aug (50)	Sep (47)	Oct (7)	Nov (7)	Dec (14)
2008	Jan (2)	Feb	Mar (4)	Apr (4)	May (5)	Jun (7)	Jul (4)	Aug	Sep (5)	Oct	Nov (1)	Dec (4)
2009	Jan	Feb (22)	Mar (12)	Apr (1)	May (1)	Jun (4)	Jul (4)	Aug	Sep	Oct (17)	Nov (3)	Dec
2010	Jan	Feb	Mar (12)	Apr (11)	May	Jun (5)	Jul (3)	Aug	Sep	Oct	Nov	Dec

yake-svn Mailing List for Yake Engine (Page 20)

yake-svn — svn commits