Thread: [Yake-svn] SF.net SVN: yake: [1516] trunk/yake (Page 2)

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

Revision: 1516
          http://svn.sourceforge.net/yake/?rev=1516&view=rev
Author:   psyclonist
Date:     2006-12-06 15:49:58 -0800 (Wed, 06 Dec 2006)

Log Message:
-----------
drastically reduced compile times for core,
various cleanup operations,
modified includes,
removed deprecated code

Modified Paths:
--------------
    trunk/yake/src/yake/base/math/yakeMath.cpp
    trunk/yake/src/yake/base/math/yakeQuaternion.cpp
    trunk/yake/src/yake/base/math/yakeVector3.cpp
    trunk/yake/src/yake/base/templates/yakeSmartAssert.cpp
    trunk/yake/src/yake/base/yakeMovable.cpp
    trunk/yake/src/yake/base/yakeUniqueName.cpp
    trunk/yake/src/yake/net/detail/netCommon.cpp
    trunk/yake/src/yake/plugins/inputOgre/InputSystemOgre.cpp
    trunk/yake/src/yapp/plugins/ceguiOgreRendererAdapter/plugin.cpp
    trunk/yake/src/yapp/raf/yakeApplication.cpp
    trunk/yake/yake/base/templates/yakeSmartAssert.h
    trunk/yake/yake/base/yake.h
    trunk/yake/yake/base/yakeException.h
    trunk/yake/yake/base/yakeLibrary.h
    trunk/yake/yake/base/yakeMovable.h
    trunk/yake/yake/base/yakePCH.h
    trunk/yake/yake/base/yakeParamHolder.h
    trunk/yake/yake/base/yakePrerequisites.h

Added Paths:
-----------
    trunk/yake/src/yake/base/templates/yakeSmartAssertHandlers.cpp
    trunk/yake/yake/base/templates/yakeSmartAssertHandlers.h
    trunk/yake/yake/base/yakeNoncopyable.h

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

Modified: trunk/yake/src/yake/base/math/yakeMath.cpp
===================================================================

--- trunk/yake/src/yake/base/math/yakeMath.cpp	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/src/yake/base/math/yakeMath.cpp	2006-12-06 23:49:58 UTC (rev 1516)
@@ -28,6 +28,7 @@
 //    IMPLEMENTATION HEADERS
 //============================================================================
 #include <yake/base/yakePCH.h>
+#include <yake/base/math/yakeMath.h>
 
 #include <stdlib.h> // for RAND_MAX
 

Modified: trunk/yake/src/yake/base/math/yakeQuaternion.cpp
===================================================================
--- trunk/yake/src/yake/base/math/yakeQuaternion.cpp	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/src/yake/base/math/yakeQuaternion.cpp	2006-12-06 23:49:58 UTC (rev 1516)
@@ -375,10 +375,10 @@
             return rkP;
 
         real fSin = Math::Sin(fAngle);
-        real fInvSin = 1.0/fSin;
-        real fCoeff0 = Math::Sin((1.0-fT)*fAngle)*fInvSin;
+        real fInvSin = real(1.0)/fSin;
+        real fCoeff0 = Math::Sin((real(1.0)-fT)*fAngle)*fInvSin;
         // Do we need to invert rotation?
-        if (fCos < 0.0f && shortestPath)
+        if (fCos < real(0.) && shortestPath)
         {
             fCoeff0 = -fCoeff0;
         }
@@ -397,8 +397,8 @@
 
         real fSin = Math::Sin(fAngle);
         real fPhase = Math::PI*iExtraSpins*fT;
-        real fInvSin = 1.0/fSin;
-        real fCoeff0 = Math::Sin((1.0-fT)*fAngle - fPhase)*fInvSin;
+        real fInvSin = real(1.0)/fSin;
+        real fCoeff0 = Math::Sin((real(1.0)-fT)*fAngle - fPhase)*fInvSin;
         real fCoeff1 = Math::Sin(fT*fAngle + fPhase)*fInvSin;
         return fCoeff0*rkP + fCoeff1*rkQ;
     }
@@ -424,7 +424,7 @@
         const Quaternion& rkP, const Quaternion& rkA,
         const Quaternion& rkB, const Quaternion& rkQ, bool shortestPath)
     {
-        real fSlerpT = 2.0*fT*(1.0-fT);
+        real fSlerpT = real(2.0)*fT*(real(1.0)-fT);
         Quaternion kSlerpP = Slerp(fT, rkP, rkQ, shortestPath);
         Quaternion kSlerpQ = Slerp(fT, rkA, rkB);
         return Slerp(fSlerpT, kSlerpP ,kSlerpQ);

Modified: trunk/yake/src/yake/base/math/yakeVector3.cpp
===================================================================
--- trunk/yake/src/yake/base/math/yakeVector3.cpp	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/src/yake/base/math/yakeVector3.cpp	2006-12-06 23:49:58 UTC (rev 1516)
@@ -28,6 +28,7 @@
 //    IMPLEMENTATION HEADERS
 //============================================================================
 #include <yake/base/yakePCH.h>
+#include <yake/base/math/yakeVector3.h>
 
 //============================================================================
 //    INTERFACE STRUCTURES / UTILITY CLASSES

Modified: trunk/yake/src/yake/base/templates/yakeSmartAssert.cpp
===================================================================
--- trunk/yake/src/yake/base/templates/yakeSmartAssert.cpp	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/src/yake/base/templates/yakeSmartAssert.cpp	2006-12-06 23:49:58 UTC (rev 1516)
@@ -31,6 +31,7 @@
 #include <yake/base/templates/yakeSmartAssert.h>
 #include <yake/base/native/yakeNative.h>
 #include <boost/function.hpp>
+#include <yake/base/templates/yakeSmartAssertHandlers.h>
 
 //============================================================================
 //    INTERFACE STRUCTURES / UTILITY CLASSES
@@ -169,27 +170,11 @@
 	}
 
 	//-----------------------------------------------------
-	SmartAssert::HandlerMap SmartAssert::mHandlers;
-
-	//-----------------------------------------------------
-	SmartAssert::SMARTASSERT_HANDLER_FUN SmartAssert::getHandler()
-	{
-		if (mHandlers.size() < 4)
-		{
-			// set defaults
-			mHandlers[ AL_WARNING ] = defaultHandler;
-			mHandlers[ AL_DEBUG ] = defaultHandler;
-			mHandlers[ AL_ERROR ] = defaultHandler;
-			mHandlers[ AL_FATAL ] = defaultHandler;
-		}
-		return mHandlers[ mCtx.getLevel() ];
-	}
-
-	//-----------------------------------------------------
 	SmartAssert::~SmartAssert()
 	{
-		if (getHandler())
-			getHandler()( mCtx );
+		assert::SMARTASSERT_HANDLER_FUN handlerFn = assert::SmartAssertHandlerManager::instance().getHandler( mCtx.getLevel() );
+		if (handlerFn)
+			handlerFn( mCtx );
 		else
 		{
 			std::ostringstream out;

Added: trunk/yake/src/yake/base/templates/yakeSmartAssertHandlers.cpp
===================================================================
--- trunk/yake/src/yake/base/templates/yakeSmartAssertHandlers.cpp	                        (rev 0)
+++ trunk/yake/src/yake/base/templates/yakeSmartAssertHandlers.cpp	2006-12-06 23:49:58 UTC (rev 1516)
@@ -0,0 +1,85 @@
+/*
+   ------------------------------------------------------------------------------------
+   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.
+   ------------------------------------------------------------------------------------
+*/
+#include <yake/base/yakePCH.h>
+#include <yake/base/templates/yakeSmartAssertHandlers.h>
+#include <yake/base/native/yakeNative.h>
+
+namespace yake  {
+namespace assert {
+
+	//-----------------------------------------------------
+	void defaultHandler( const SmartAssertContext& ctx )
+	{
+		// print all messages to "cout"
+		std::ostringstream out;
+		ctx.toStream( out );
+		std::cout << std::endl << out.str();
+
+		bool IgnoreAlways = false;
+
+		if (ctx.getLevel() != AL_WARNING) // "warning" assertions are logged only.
+		{
+			if( !native::debug_AssertFailed(
+				ctx.getMessage().c_str(),
+				ctx.getExpression().c_str(), 
+				ctx.getFile().c_str(),
+				ctx.getLine(), 
+				IgnoreAlways ) 
+				&& !IgnoreAlways )
+			{
+				abort();
+			}
+		}
+
+		if (ctx.getLevel() == AL_ERROR || ctx.getLevel() == AL_FATAL)
+			abort();
+	}
+
+	//-----------------------------------------------------
+	SmartAssertHandlerManager::HandlerMap SmartAssertHandlerManager::mHandlers;
+	SmartAssertHandlerManager SmartAssertHandlerManager::mInstance;
+
+	//-----------------------------------------------------
+	SMARTASSERT_HANDLER_FUN SmartAssertHandlerManager::getHandler(const AssertionLevel lvl) const
+	{
+		return mHandlers.find( lvl )->second;
+	}
+	SmartAssertHandlerManager::SmartAssertHandlerManager()
+	{
+		// set defaults
+		mHandlers[ AL_WARNING ] = defaultHandler;
+		mHandlers[ AL_DEBUG ] = defaultHandler;
+		mHandlers[ AL_ERROR ] = defaultHandler;
+		mHandlers[ AL_FATAL ] = defaultHandler;
+	}
+	SmartAssertHandlerManager& SmartAssertHandlerManager::instance()
+	{
+		return mInstance;
+	}
+
+} // assert
+} // yake

Deleted: trunk/yake/src/yake/base/yakeCriticalSection.cpp
===================================================================
--- trunk/yake/src/yake/base/yakeCriticalSection.cpp	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/src/yake/base/yakeCriticalSection.cpp	2006-12-06 23:49:58 UTC (rev 1516)
@@ -1,68 +0,0 @@
-/*
-   ------------------------------------------------------------------------------------
-   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
-//============================================================================
-#include <yake/base/yakePCH.h>
-#include <yake/base/yakeCriticalSection.h>
-#include <yake/base/yakeException.h>
-#include <yake/base/native/yakeNative.h>
-
-
-//============================================================================
-//    INTERFACE STRUCTURES / UTILITY CLASSES
-//============================================================================
-namespace yake {
-
-CriticalSection::CriticalSection()
-{
-	YAKE_DECLARE_FUNCTION( CriticalSection )
-	mHandle = native::criticalSection_Create();
-
-	if( 0 == mHandle )
-		YAKE_EXCEPT( "Couldn't create critical section." );
-}
-
-CriticalSection::~CriticalSection()
-{
-	if( 0 != mHandle )
-		native::criticalSection_Delete( mHandle );
-}
-
-
-void CriticalSection::enter()
-{
-	native::criticalSection_Enter( mHandle );
-}
-
-void CriticalSection::leave()
-{
-	native::criticalSection_Leave( mHandle );
-}
-
-} // yake

Deleted: trunk/yake/src/yake/base/yakeLock.cpp
===================================================================
--- trunk/yake/src/yake/base/yakeLock.cpp	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/src/yake/base/yakeLock.cpp	2006-12-06 23:49:58 UTC (rev 1516)
@@ -1,51 +0,0 @@
-/*
-   ------------------------------------------------------------------------------------
-   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
-//============================================================================
-#include <yake/base/yakePCH.h>
-#include <yake/base/yakeLock.h>
-#include <yake/base/yakeCriticalSection.h>
-
-//============================================================================
-//    INTERFACE STRUCTURES / UTILITY CLASSES
-//============================================================================
-namespace yake {
-
-Lock::Lock( CriticalSection& rCriticalSection )
-: mrCriticalSection( rCriticalSection )
-{
-  mrCriticalSection.enter();
-}
-
-Lock::~Lock()
-{
-  mrCriticalSection.leave();
-}
-
-} // yake

Modified: trunk/yake/src/yake/base/yakeMovable.cpp
===================================================================
--- trunk/yake/src/yake/base/yakeMovable.cpp	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/src/yake/base/yakeMovable.cpp	2006-12-06 23:49:58 UTC (rev 1516)
@@ -25,6 +25,7 @@
    ------------------------------------------------------------------------------------
 */
 #include <yake/base/yakePCH.h>
+#include <yake/base/yakeMovable.h>
 
 namespace yake {
 

Modified: trunk/yake/src/yake/base/yakeUniqueName.cpp
===================================================================
--- trunk/yake/src/yake/base/yakeUniqueName.cpp	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/src/yake/base/yakeUniqueName.cpp	2006-12-06 23:49:58 UTC (rev 1516)
@@ -28,6 +28,7 @@
 //    IMPLEMENTATION HEADERS
 //============================================================================
 #include <yake/base/yakePCH.h>
+#include <yake/base/yakeString.h>
 
 //============================================================================
 //    INTERFACE STRUCTURES / UTILITY CLASSES
@@ -35,15 +36,14 @@
 namespace yake {
 namespace uniqueName  {
 
-String create( const String& rPre, const String& rPost )
-{
-	static uint32 iIndex = 0;
-	String final = rPre;
-	final << iIndex++;
-	return final + rPost;
-}
+	YAKE_BASE_API String create( const String& rPre, const String& rPost )
+	{
+		static uint32 iIndex = 0;
+		String final = rPre;
+		final << iIndex++;
+		return final + rPost;
+	}
 
-
 } // uniqueName
 } // yake
 

Modified: trunk/yake/src/yake/net/detail/netCommon.cpp
===================================================================
--- trunk/yake/src/yake/net/detail/netCommon.cpp	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/src/yake/net/detail/netCommon.cpp	2006-12-06 23:49:58 UTC (rev 1516)
@@ -270,5 +270,11 @@
 		return time_;
 	}
 
+
+	PacketPtr createPacket(const void* data, const size_t size)
+	{
+		return PacketPtr( new Packet(data,size) );
+	}
+
 } // namespace net
 } // namespace yake

Modified: trunk/yake/src/yake/plugins/inputOgre/InputSystemOgre.cpp
===================================================================
--- trunk/yake/src/yake/plugins/inputOgre/InputSystemOgre.cpp	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/src/yake/plugins/inputOgre/InputSystemOgre.cpp	2006-12-06 23:49:58 UTC (rev 1516)
@@ -27,13 +27,8 @@
 #include <yake/plugins/inputOgre/yakePCH.h>
 #include <yake/input/yakeInputSystem.h>
 #include <yake/plugins/inputOgre/InputSystemOgre.h>
-
-#include <OgreMemoryMacros.h>
 #include <Ogre.h>
-#ifdef OGRE_MEMORY_MACROS
-#pragma message("disabling OGRE's memory macros")
-#	include <OgreNoMemoryMacros.h>
-#endif
+//#include <OgreNoMemoryMacros.h> // unfortunately, this doesn't really seem to work well...
 
 namespace yake {
 namespace input {

Modified: trunk/yake/src/yapp/plugins/ceguiOgreRendererAdapter/plugin.cpp
===================================================================
--- trunk/yake/src/yapp/plugins/ceguiOgreRendererAdapter/plugin.cpp	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/src/yapp/plugins/ceguiOgreRendererAdapter/plugin.cpp	2006-12-06 23:49:58 UTC (rev 1516)
@@ -26,7 +26,7 @@
 */
 #include <yapp/plugins/ceguiOgreRendererAdapter/pch.h>
 #include "OgreNoMemoryMacros.h"
-#include <CEGUI/CEGUI.h>
+#include <CEGUI.h>
 #include <Ogre.h>
 #include "OgreCEGUIRenderer.h"
 #include <yapp/common/yakeCEGUIRendererAdapter.h>

Modified: trunk/yake/src/yapp/raf/yakeApplication.cpp
===================================================================
--- trunk/yake/src/yapp/raf/yakeApplication.cpp	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/src/yapp/raf/yakeApplication.cpp	2006-12-06 23:49:58 UTC (rev 1516)
@@ -29,8 +29,8 @@
 #include <yapp/raf/yakeApplicationState.h>
 #include <yapp/raf/yakeApplication.h>
 #if YAKE_RAF_USES_CEGUI == 1
-#include <CEGUI/CEGUI.h>
-#include <CEGUI/CEGUISystem.h>
+#include <CEGUI.h>
+#include <CEGUISystem.h>
 #include <yapp/common/yakeCEGUIRendererAdapter.h>
 #include <yapp/common/yakeCEGUIHelpers.h>
 #ifdef YAKE_DEBUG
@@ -39,6 +39,7 @@
 #	pragma comment(lib,"CEGUIBase.lib")
 #endif
 #endif
+#include <OgreNoMemoryMacros.h>
 
 namespace yake {
 namespace raf {

Modified: trunk/yake/yake/base/templates/yakeSmartAssert.h
===================================================================
--- trunk/yake/yake/base/templates/yakeSmartAssert.h	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/yake/base/templates/yakeSmartAssert.h	2006-12-06 23:49:58 UTC (rev 1516)
@@ -32,7 +32,6 @@
 //============================================================================
 #include <yake/base/yakePrerequisites.h>
 #include <yake/base/yakeString.h>
-#include <boost/function.hpp>
 
 //============================================================================
 //    INTERFACE STRUCTURES / UTILITY CLASSES
@@ -128,14 +127,8 @@
 		SmartAssert& YAKE_ASSERT_A;
 		SmartAssert& YAKE_ASSERT_B;
 
-		/** Assertion handler.
-		*/
-		typedef ::boost::function< void(const ::yake::SmartAssertContext&) > SMARTASSERT_HANDLER_FUN;
 	private:
 		SmartAssertContext	mCtx;
-
-		typedef std::map< AssertionLevel, SMARTASSERT_HANDLER_FUN > HandlerMap;
-		static HandlerMap mHandlers;
 	public:
 		SmartAssert( const char * strExpr ) : YAKE_ASSERT_A(*this), YAKE_ASSERT_B(*this), mCtx(strExpr) {}
 		~SmartAssert();
@@ -160,8 +153,6 @@
 		void error( const String & msg );
 		void fatal( const String & msg );
 		SmartAssert& msg( const String & msg );
-	private:
-		SMARTASSERT_HANDLER_FUN getHandler();
 	};
 
 

Added: trunk/yake/yake/base/templates/yakeSmartAssertHandlers.h
===================================================================
--- trunk/yake/yake/base/templates/yakeSmartAssertHandlers.h	                        (rev 0)
+++ trunk/yake/yake/base/templates/yakeSmartAssertHandlers.h	2006-12-06 23:49:58 UTC (rev 1516)
@@ -0,0 +1,56 @@
+/*
+   ------------------------------------------------------------------------------------
+   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.
+   ------------------------------------------------------------------------------------
+*/
+#ifndef YAKE_BASESMARTASSERTHANDLERS_H
+#define YAKE_BASESMARTASSERTHANDLERS_H
+
+#include <yake/base/yakePrerequisites.h>
+#include <yake/base/templates/yakeSmartAssert.h>
+#include <yake/base/yakeNoncopyable.h>
+#include <boost/function.hpp>
+
+namespace yake {
+namespace assert {
+
+	typedef ::boost::function< void(const ::yake::SmartAssertContext&) > SMARTASSERT_HANDLER_FUN;
+	struct YAKE_BASE_API SmartAssertHandlerManager : public noncopyable
+	{
+	private:
+		typedef std::map< AssertionLevel, SMARTASSERT_HANDLER_FUN > HandlerMap;
+		static HandlerMap mHandlers;
+
+		SmartAssertHandlerManager();
+		static SmartAssertHandlerManager mInstance;
+	public:
+		static SmartAssertHandlerManager& instance();
+
+		SMARTASSERT_HANDLER_FUN getHandler(const AssertionLevel) const;
+	};
+
+} // assert
+} // yake
+
+#endif // YAKE_BASESMARTASSERT_H

Modified: trunk/yake/yake/base/yake.h
===================================================================
--- trunk/yake/yake/base/yake.h	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/yake/base/yake.h	2006-12-06 23:49:58 UTC (rev 1516)
@@ -34,19 +34,54 @@
 #include "yakePrerequisites.h"
 #include "yakePCH.h"
 
+#include <boost/function.hpp>
+
+#include "templates/yakeSmartAssert.h"
+#include "templates/yakeRegistry.h"
+#include "templates/yakeVector.h"
+#include "templates/yakePointer.h"
+#include <yake/base/templates/yakeDeque.h>
+#include <yake/base/templates/delete.h>
+#include <yake/base/templates/yakeVariant.h>
+#include "templates/yakeAlgorithms.h"
+
+#include <yake/base/mpl/yakeAbstractFactory.h>
+#include <yake/base/mpl/sequences.h>
+
+#include "yakeVersion.h"
+#include "yakeString.h"
+#include "yakeException.h"
+#include "yakeLog.h"
+#include "yakeOutputStream.h"
+#include "yakeUniqueName.h"
+#include "yakePlugin.h"
+//#include "yakeDebugOutputStream.h"
+#include "yakeLibrary.h"
+#include <yake/base/type_info.h>
+
+#include "math/yakeQuaternion.h"
+#include "math/yakeVector3.h"
+#include "math/yakeVector4.h"
+#include "math/yakeMatrix3.h"
+#include "math/yakeMatrix4.h"
+#include "math/yakeColor.h"
+#include "math/yakeGeometry.h"
+#include "math/yakeSimpleSpline.h"
+#include "math/yakePlane.h"
+#include "math/yakeRay.h"
+
+#include "yakeParamHolder.h"
+#include "yakeMovable.h"
+
+#include "yakeTimer.h"
+
 //============================================================================
 //    INTERFACE STRUCTURES / UTILITY CLASSES
 //============================================================================
 
-#	if YAKE_COMPILER == COMPILER_MSVC
-#pragma comment(lib, "base.lib")
-#	endif
+namespace yake {
+namespace base {
 
-namespace yake
-{
-namespace base
-{
-
 extern YAKE_BASE_API Version linktime;
 const Version compiletime ( 0, 6, 0 );
 

Deleted: trunk/yake/yake/base/yakeCriticalSection.h
===================================================================
--- trunk/yake/yake/base/yakeCriticalSection.h	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/yake/base/yakeCriticalSection.h	2006-12-06 23:49:58 UTC (rev 1516)
@@ -1,65 +0,0 @@
-/*
-   ------------------------------------------------------------------------------------
-   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.
-   ------------------------------------------------------------------------------------
-*/
-#ifndef YAKE_BASE_CRITICALSECTION_H
-#define YAKE_BASE_CRITICALSECTION_H
-
-//============================================================================
-//    IMPLEMENTATION HEADERS
-//============================================================================
-// Standard headers
-#ifndef YAKE_BASE_PREREQUISITES_H
-#	include "yakePrerequisites.h"
-#endif
-// Yake
-#include <yake/base/native/yakeNative.h>
-
-//============================================================================
-//    INTERFACE STRUCTURES / UTILITY CLASSES
-//============================================================================
-namespace yake {
-
-class YAKE_BASE_API CriticalSection
-{
-YAKE_DECLARE_CLASS( yake::base::CriticalSection )
-// Class
-public:
-  CriticalSection();
-  ~CriticalSection();
-
-// Methods
-public:
-  void enter();
-  void leave();
-
-// Data
-private:
-	native::CriticalSectionHandle mHandle;
-};
-
-} // yake
-
-#endif // YAKE_BASE_CRITICALSECTION_H

Modified: trunk/yake/yake/base/yakeException.h
===================================================================
--- trunk/yake/yake/base/yakeException.h	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/yake/base/yakeException.h	2006-12-06 23:49:58 UTC (rev 1516)
@@ -39,6 +39,7 @@
 #endif
 // Yake
 #include <yake/base/mpl/yakeCast.h>
+#include <yake/base/yakeString.h>
 
 //============================================================================
 //    INTERFACE STRUCTURES / UTILITY CLASSES

Modified: trunk/yake/yake/base/yakeLibrary.h
===================================================================
--- trunk/yake/yake/base/yakeLibrary.h	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/yake/base/yakeLibrary.h	2006-12-06 23:49:58 UTC (rev 1516)
@@ -37,41 +37,32 @@
 // Yake
 #include <yake/base/native/yakeNative.h>
 #include <yake/base/yakeString.h>
+#include <yake/base/yakeNoncopyable.h>
 
 //============================================================================
 //    INTERFACE STRUCTURES / UTILITY CLASSES
 //============================================================================
-namespace yake
-{
-namespace base
-{
+namespace yake {
+namespace base {
 
-class YAKE_BASE_API Library
-{
-YAKE_DECLARE_CLASS( yake::base::Library )
-// Class
-public:
-  Library( const String& rFilename );
-  virtual ~Library();
+	class YAKE_BASE_API Library : public noncopyable
+	{
+	public:
+		/** Loads the library with the given name.
+			@remarks Throws Exception on failure.
+		*/
+		Library( const String& rFilename );
+		virtual ~Library();
 
-// Methods
-public:
-  void* getSymbol( const String& rFunction );
+		/** Returns pointer for the given symbol name. */
+		void* getSymbol( const String& rFunction );
 
-// Data
-private:
-	native::LibraryHandle mHandle;
-};
+	private:
+		native::LibraryHandle mHandle;
+	};
 
 } // base
 } // yake
 
-// todo platform independent library extension?
-// windows : ".dll"
-// linux : ".so"
-#define YAKE_USE_LIB( dllname ) \
-	yake::SharedPtr< yake::base::Library > pDynLib##dllname( new yake::base::Library( ## #dllname ".dll" ) ); \
-	YAKE_ASSERT( pDynLib##dllname ).debug( "Out of memory." );
-
 #endif // YAKE_BASE_LIBRARY_H
 

Deleted: trunk/yake/yake/base/yakeLock.h
===================================================================
--- trunk/yake/yake/base/yakeLock.h	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/yake/base/yakeLock.h	2006-12-06 23:49:58 UTC (rev 1516)
@@ -1,60 +0,0 @@
-/*
-   ------------------------------------------------------------------------------------
-   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.
-   ------------------------------------------------------------------------------------
-*/
-#ifndef YAKE_BASE_LOCK_H
-#define YAKE_BASE_LOCK_H
-
-//============================================================================
-//    IMPLEMENTATION HEADERS
-//============================================================================
-// Standard headers
-#ifndef YAKE_BASE_PREREQUISITES_H
-#	include "yakePrerequisites.h"
-#endif
-// Yake
-
-//============================================================================
-//    INTERFACE STRUCTURES / UTILITY CLASSES
-//============================================================================
-namespace yake {
-
-class CriticalSection;
-
-class YAKE_BASE_API Lock
-{
-// Class
-public:
-  Lock( CriticalSection& rCriticalSection );
-  ~Lock();
-
- // Data
-private:
-  CriticalSection& mrCriticalSection;
-};
-
-} // yake
-
-#endif // YAKE_BASE_LOCK_H

Modified: trunk/yake/yake/base/yakeMovable.h
===================================================================
--- trunk/yake/yake/base/yakeMovable.h	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/yake/base/yakeMovable.h	2006-12-06 23:49:58 UTC (rev 1516)
@@ -31,7 +31,8 @@
 //    IMPLEMENTATION HEADERS
 //============================================================================
 // Standard headers
-#include "yakePrerequisites.h"
+#include <yake/base/yakePrerequisites.h>
+#include <yake/base/math/yakeVector3.h>
 // Yake
 
 //============================================================================

Added: trunk/yake/yake/base/yakeNoncopyable.h
===================================================================
--- trunk/yake/yake/base/yakeNoncopyable.h	                        (rev 0)
+++ trunk/yake/yake/base/yakeNoncopyable.h	2006-12-06 23:49:58 UTC (rev 1516)
@@ -0,0 +1,45 @@
+/*
+   ------------------------------------------------------------------------------------
+   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.
+   ------------------------------------------------------------------------------------
+*/
+#ifndef YAKE_BASE_NONCOPYABLE_H
+#define YAKE_BASE_NONCOPYABLE_H
+
+namespace yake {
+
+	/** Base class for non-copyable types. */
+	struct YAKE_BASE_API noncopyable
+	{
+		~noncopyable() {}
+	protected:
+		noncopyable() {}
+	private:
+		noncopyable(const noncopyable&);
+		noncopyable& operator=(const noncopyable&);
+	};
+
+} // namespace yake
+
+#endif // YAKE_BASE_NONCOPYABLE_H

Modified: trunk/yake/yake/base/yakePCH.h
===================================================================
--- trunk/yake/yake/base/yakePCH.h	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/yake/base/yakePCH.h	2006-12-06 23:49:58 UTC (rev 1516)
@@ -27,51 +27,7 @@
 #ifndef YAKE_BASE_PCH_H
 #define YAKE_BASE_PCH_H
 
-//============================================================================
-//    IMPLEMENTATION HEADERS
-//============================================================================
 #include "yakePrerequisites.h"
+#include <yake/base/templates/yakeSmartAssert.h>
 
-#include "templates/yakeSmartAssert.h"
-#include "templates/yakeRegistry.h"
-#include "templates/yakeVector.h"
-#include "templates/yakePointer.h"
-#include <yake/base/templates/yakeDeque.h>
-#include <yake/base/templates/delete.h>
-#include <yake/base/templates/yakeVariant.h>
-#include "templates/yakeAlgorithms.h"
-
-#include <yake/base/mpl/yakeAbstractFactory.h>
-#include <yake/base/mpl/sequences.h>
-
-#include "yakePrerequisites.h"
-#include "yakeVersion.h"
-#include "yakeString.h"
-#include "yakeException.h"
-#include "yakeLog.h"
-#include "yakeOutputStream.h"
-#include "yakeUniqueName.h"
-#include "yakePlugin.h"
-//#include "yakeDebugOutputStream.h"
-#include "yakeLibrary.h"
-#include <yake/base/type_info.h>
-
-#include "math/yakeQuaternion.h"
-#include "math/yakeVector3.h"
-#include "math/yakeVector4.h"
-#include "math/yakeMatrix3.h"
-#include "math/yakeMatrix4.h"
-#include "math/yakeColor.h"
-#include "math/yakeGeometry.h"
-#include "math/yakeSimpleSpline.h"
-#include "math/yakePlane.h"
-#include "math/yakeRay.h"
-
-#include "yakeParamHolder.h"
-#include "yakeMovable.h"
-
-#include "yakeTimer.h"
-
-
-
 #endif // YAKE_BASE_PCH_H

Modified: trunk/yake/yake/base/yakeParamHolder.h
===================================================================
--- trunk/yake/yake/base/yakeParamHolder.h	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/yake/base/yakeParamHolder.h	2006-12-06 23:49:58 UTC (rev 1516)
@@ -27,7 +27,10 @@
 #ifndef YAKE_BASE_PARAMHOLDER_H
 #define YAKE_BASE_PARAMHOLDER_H
 
-#include "yakePrerequisites.h"
+#include <yake/base/yakePrerequisites.h>
+#include <yake/base/templates/yakeVector.h>
+#include <yake/base/yakeString.h>
+#include <boost/any.hpp>
 
 namespace yake {
 

Modified: trunk/yake/yake/base/yakePrerequisites.h
===================================================================
--- trunk/yake/yake/base/yakePrerequisites.h	2006-12-06 23:42:16 UTC (rev 1515)
+++ trunk/yake/yake/base/yakePrerequisites.h	2006-12-06 23:49:58 UTC (rev 1516)
@@ -149,6 +149,4 @@
 #define YAKE_FOR_EACH(ITER_TYPE,ITER_NAME,CTR) \
 	for (ITER_TYPE ITER_NAME = CTR.begin(); ITER_NAME != CTR.end(); ++ITER_NAME)
 
-#include <boost/function.hpp>
-
 #endif // YAKE_BASE_PREREQUISITES_H


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




Thread: [Yake-svn] SF.net SVN: yake: [1516] trunk/yake (Page 2)

yake-svn