From c37afa91cae74827a6c601012ff219653315ef8a Mon Sep 17 00:00:00 2001 From: Oliver Kowalke Date: Mon, 9 Feb 2015 22:15:52 +0100 Subject: [PATCH] remove typedef in void-specializations --- .../boost/coroutine2/detail/pull_control_block.hpp | 14 +++++++------- .../boost/coroutine2/detail/pull_control_block.ipp | 2 +- .../boost/coroutine2/detail/push_control_block.hpp | 14 +++++++------- .../boost/coroutine2/detail/push_control_block.ipp | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/boost/coroutine2/detail/pull_control_block.hpp b/include/boost/coroutine2/detail/pull_control_block.hpp index 70c7cd2..0c1d074 100644 --- a/include/boost/coroutine2/detail/pull_control_block.hpp +++ b/include/boost/coroutine2/detail/pull_control_block.hpp @@ -71,17 +71,17 @@ struct pull_coroutine< T & >::control_block { }; struct pull_coroutine< void >::control_block { - typename push_coroutine< void >::control_block * other; - boost::context::execution_context caller; - boost::context::execution_context callee; - bool preserve_fpu; - int state; - std::exception_ptr except; + push_coroutine< void >::control_block * other; + boost::context::execution_context caller; + boost::context::execution_context callee; + bool preserve_fpu; + int state; + std::exception_ptr except; template< typename StackAllocator, typename Fn > control_block( context::preallocated, StackAllocator, rref< Fn >, bool); - explicit control_block( typename push_coroutine< void >::control_block *); + explicit control_block( push_coroutine< void >::control_block *); ~control_block(); diff --git a/include/boost/coroutine2/detail/pull_control_block.ipp b/include/boost/coroutine2/detail/pull_control_block.ipp index c3a287f..fcb7f18 100644 --- a/include/boost/coroutine2/detail/pull_control_block.ipp +++ b/include/boost/coroutine2/detail/pull_control_block.ipp @@ -212,7 +212,7 @@ pull_coroutine< void >::control_block::control_block( context::preallocated pall } inline -pull_coroutine< void >::control_block::control_block( typename push_coroutine< void >::control_block * cb) : +pull_coroutine< void >::control_block::control_block( push_coroutine< void >::control_block * cb) : other( cb), caller( other->callee), callee( other->caller), diff --git a/include/boost/coroutine2/detail/push_control_block.hpp b/include/boost/coroutine2/detail/push_control_block.hpp index de9390f..bc21552 100644 --- a/include/boost/coroutine2/detail/push_control_block.hpp +++ b/include/boost/coroutine2/detail/push_control_block.hpp @@ -75,17 +75,17 @@ struct push_coroutine< T & >::control_block { }; struct push_coroutine< void >::control_block { - typename pull_coroutine< void >::control_block * other; - boost::context::execution_context caller; - boost::context::execution_context callee; - bool preserve_fpu; - int state; - std::exception_ptr except; + pull_coroutine< void >::control_block * other; + boost::context::execution_context caller; + boost::context::execution_context callee; + bool preserve_fpu; + int state; + std::exception_ptr except; template< typename StackAllocator, typename Fn > control_block( context::preallocated, StackAllocator, rref< Fn >, bool); - explicit control_block( typename pull_coroutine< void >::control_block *); + explicit control_block( pull_coroutine< void >::control_block *); ~control_block(); diff --git a/include/boost/coroutine2/detail/push_control_block.ipp b/include/boost/coroutine2/detail/push_control_block.ipp index eabaa27..47f0b38 100644 --- a/include/boost/coroutine2/detail/push_control_block.ipp +++ b/include/boost/coroutine2/detail/push_control_block.ipp @@ -238,7 +238,7 @@ push_coroutine< void >::control_block::control_block( context::preallocated pall } inline -push_coroutine< void >::control_block::control_block( typename pull_coroutine< void >::control_block * cb) : +push_coroutine< void >::control_block::control_block( pull_coroutine< void >::control_block * cb) : other( cb), caller( other->callee), callee( other->caller),