Reformatting. (12e10fd4) · Commits · Elphel / kicad-source-mirror

common/tool/tool_manager.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -64,10 +64,12 @@ struct TOOL_MANAGER::ToolState
		std::vector<Transition> transitions;
		};


		TOOL_MANAGER::TOOL_MANAGER()
		{
		}


		void TOOL_MANAGER::RegisterTool( TOOL_BASE* aTool )
		{
		ToolState* st = new ToolState;

+47 −56

Original line number	Diff line number	Diff line
		@@ -53,10 +53,9 @@
		*/

		template<class ReturnType, class ArgType>
		class COROUTINE {

		class COROUTINE
		{
		public:

		COROUTINE()
		{
		m_stackSize = c_defaultStackSize;
		@@ -68,15 +67,10 @@ public:
		* Constructor
		* Creates a coroutine from a member method of an object
		*/

		template<class T>
		COROUTINE( T* object, ReturnType (T::*ptr)( ArgType ) ) :
		m_func (object, ptr),
		m_saved(NULL),
		m_stack(NULL),
		m_stackSize(c_defaultStackSize)
		m_func( object, ptr ), m_saved( NULL ), m_stack( NULL ), m_stackSize( c_defaultStackSize )
		{

		}

		/**
		@@ -84,10 +78,7 @@ public:
		* Creates a coroutine from a delegate object
		*/
		COROUTINE( DELEGATE<ReturnType, ArgType> aEntry ) :
		m_func(aEntry),
		m_saved(NULL),
		m_stack(NULL),
		m_stackSize(c_defaultStackSize)
		m_func( aEntry ), m_saved( NULL ), m_stack( NULL ), m_stackSize( c_defaultStackSize )
		{};

		~COROUTINE()
		@@ -190,7 +181,6 @@ public:
		}

		private:

		static const int c_defaultStackSize = 2000000;

		/* real entry point of the coroutine */
		@@ -207,15 +197,16 @@ private:
		boost::context::jump_fcontext( cor->m_self, cor->m_saved, 0 ); //reinterpret_cast<intptr_t>( this ));
		}

		template <typename T> struct strip_ref {
		template <typename T> struct strip_ref
		{
		typedef T result;
		};

		template <typename T> struct strip_ref<T&> {
		template <typename T> struct strip_ref<T&>
		{
		typedef T result;
		};


		DELEGATE<ReturnType, ArgType> m_func;

		///< pointer to coroutine entry arguments. Stripped of references

+120 −121

+1 −1

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.