Use this-> when referencing members of template base-class.

lewissbaker · lewissbaker · commit a270518e27b9 · 2017-06-11T22:02:29.000+09:30
Fixes some compilation errors under Clang.
diff --git a/include/cppcoro/lazy_task.hpp b/include/cppcoro/lazy_task.hpp
@@ -313,12 +313,12 @@ namespace cppcoro
 
 				decltype(auto) await_resume()
 				{
-					if (!m_coroutine)
+					if (!this->m_coroutine)
 					{
 						throw broken_promise{};
 					}
 
-					return m_coroutine.promise().result();
+					return this->m_coroutine.promise().result();
 				}
 			};
 
@@ -333,12 +333,12 @@ namespace cppcoro
 
 				decltype(auto) await_resume()
 				{
-					if (!m_coroutine)
+					if (!this->m_coroutine)
 					{
 						throw broken_promise{};
 					}
 
-					return std::move(m_coroutine.promise()).result();
+					return std::move(this->m_coroutine.promise()).result();
 				}
 			};
 
diff --git a/include/cppcoro/shared_lazy_task.hpp b/include/cppcoro/shared_lazy_task.hpp
@@ -223,7 +223,7 @@ namespace cppcoro
 
 			~shared_lazy_task_promise()
 			{
-				if (is_ready() && !completed_with_unhandled_exception())
+				if (this->is_ready() && !this->completed_with_unhandled_exception())
 				{
 					reinterpret_cast<T*>(&m_valueStorage)->~T();
 				}
@@ -245,7 +245,7 @@ namespace cppcoro
 
 			T& result()
 			{
-				rethrow_if_unhandled_exception();
+				this->rethrow_if_unhandled_exception();
 				return *reinterpret_cast<T*>(&m_valueStorage);
 			}
 
@@ -275,7 +275,7 @@ namespace cppcoro
 
 			void result()
 			{
-				rethrow_if_unhandled_exception();
+				this->rethrow_if_unhandled_exception();
 			}
 
 		};
@@ -299,7 +299,7 @@ namespace cppcoro
 
 			T& result()
 			{
-				rethrow_if_unhandled_exception();
+				this->rethrow_if_unhandled_exception();
 				return *m_value;
 			}
 
@@ -426,12 +426,12 @@ namespace cppcoro
 
 				decltype(auto) await_resume()
 				{
-					if (!m_coroutine)
+					if (!this->m_coroutine)
 					{
 						throw broken_promise{};
 					}
 
-					return m_coroutine.promise().result();
+					return this->m_coroutine.promise().result();
 				}
 			};
 
diff --git a/include/cppcoro/shared_task.hpp b/include/cppcoro/shared_task.hpp
@@ -184,7 +184,7 @@ namespace cppcoro
 
 			~shared_task_promise()
 			{
-				if (!completed_with_unhandled_exception())
+				if (!this->completed_with_unhandled_exception())
 				{
 					reinterpret_cast<T*>(&m_valueStorage)->~T();
 				}
@@ -206,7 +206,7 @@ namespace cppcoro
 
 			T& result()
 			{
-				rethrow_if_unhandled_exception();
+				this->rethrow_if_unhandled_exception();
 				return *reinterpret_cast<T*>(&m_valueStorage);
 			}
 
@@ -236,7 +236,7 @@ namespace cppcoro
 
 			void result()
 			{
-				rethrow_if_unhandled_exception();
+				this->rethrow_if_unhandled_exception();
 			}
 
 		};
@@ -260,7 +260,7 @@ namespace cppcoro
 
 			T& result()
 			{
-				rethrow_if_unhandled_exception();
+				this->rethrow_if_unhandled_exception();
 				return *m_value;
 			}
 
@@ -387,12 +387,12 @@ namespace cppcoro
 
 				decltype(auto) await_resume()
 				{
-					if (!m_coroutine)
+					if (!this->m_coroutine)
 					{
 						throw broken_promise{};
 					}
 
-					return m_coroutine.promise().result();
+					return this->m_coroutine.promise().result();
 				}
 			};
 
diff --git a/include/cppcoro/task.hpp b/include/cppcoro/task.hpp
@@ -341,12 +341,12 @@ namespace cppcoro
 
 				decltype(auto) await_resume()
 				{
-					if (!m_coroutine)
+					if (!this->m_coroutine)
 					{
 						throw broken_promise{};
 					}
 
-					return m_coroutine.promise().result();
+					return this->m_coroutine.promise().result();
 				}
 			};
 
@@ -361,12 +361,12 @@ namespace cppcoro
 
 				decltype(auto) await_resume()
 				{
-					if (!m_coroutine)
+					if (!this->m_coroutine)
 					{
 						throw broken_promise{};
 					}
 
-					return std::move(m_coroutine.promise()).result();
+					return std::move(this->m_coroutine.promise()).result();
 				}
 			};
 

Original file line number	Diff line number	Diff line change
`@@ -313,12 +313,12 @@ namespace cppcoro`
`313`	`313`
`314`	`314`	`decltype(auto) await_resume()`
`315`	`315`	`{`
`316`		`- if (!m_coroutine)`
	`316`	`+ if (!this->m_coroutine)`
`317`	`317`	`{`
`318`	`318`	`throw broken_promise{};`
`319`	`319`	`}`
`320`	`320`
`321`		`- return m_coroutine.promise().result();`
	`321`	`+ return this->m_coroutine.promise().result();`
`322`	`322`	`}`
`323`	`323`	`};`
`324`	`324`
`@@ -333,12 +333,12 @@ namespace cppcoro`
`333`	`333`
`334`	`334`	`decltype(auto) await_resume()`
`335`	`335`	`{`
`336`		`- if (!m_coroutine)`
	`336`	`+ if (!this->m_coroutine)`
`337`	`337`	`{`
`338`	`338`	`throw broken_promise{};`
`339`	`339`	`}`
`340`	`340`
`341`		`- return std::move(m_coroutine.promise()).result();`
	`341`	`+ return std::move(this->m_coroutine.promise()).result();`
`342`	`342`	`}`
`343`	`343`	`};`
`344`	`344`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ namespace cppcoro`
`223`	`223`
`224`	`224`	`~shared_lazy_task_promise()`
`225`	`225`	`{`
`226`		`- if (is_ready() && !completed_with_unhandled_exception())`
	`226`	`+ if (this->is_ready() && !this->completed_with_unhandled_exception())`
`227`	`227`	`{`
`228`	`228`	`reinterpret_cast<T*>(&m_valueStorage)->~T();`
`229`	`229`	`}`
`@@ -245,7 +245,7 @@ namespace cppcoro`
`245`	`245`
`246`	`246`	`T& result()`
`247`	`247`	`{`
`248`		`- rethrow_if_unhandled_exception();`
	`248`	`+ this->rethrow_if_unhandled_exception();`
`249`	`249`	`return reinterpret_cast<T>(&m_valueStorage);`
`250`	`250`	`}`
`251`	`251`
`@@ -275,7 +275,7 @@ namespace cppcoro`
`275`	`275`
`276`	`276`	`void result()`
`277`	`277`	`{`
`278`		`- rethrow_if_unhandled_exception();`
	`278`	`+ this->rethrow_if_unhandled_exception();`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`};`
`@@ -299,7 +299,7 @@ namespace cppcoro`
`299`	`299`
`300`	`300`	`T& result()`
`301`	`301`	`{`
`302`		`- rethrow_if_unhandled_exception();`
	`302`	`+ this->rethrow_if_unhandled_exception();`
`303`	`303`	`return *m_value;`
`304`	`304`	`}`
`305`	`305`
`@@ -426,12 +426,12 @@ namespace cppcoro`
`426`	`426`
`427`	`427`	`decltype(auto) await_resume()`
`428`	`428`	`{`
`429`		`- if (!m_coroutine)`
	`429`	`+ if (!this->m_coroutine)`
`430`	`430`	`{`
`431`	`431`	`throw broken_promise{};`
`432`	`432`	`}`
`433`	`433`
`434`		`- return m_coroutine.promise().result();`
	`434`	`+ return this->m_coroutine.promise().result();`
`435`	`435`	`}`
`436`	`436`	`};`
`437`	`437`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ namespace cppcoro`
`184`	`184`
`185`	`185`	`~shared_task_promise()`
`186`	`186`	`{`
`187`		`- if (!completed_with_unhandled_exception())`
	`187`	`+ if (!this->completed_with_unhandled_exception())`
`188`	`188`	`{`
`189`	`189`	`reinterpret_cast<T*>(&m_valueStorage)->~T();`
`190`	`190`	`}`
`@@ -206,7 +206,7 @@ namespace cppcoro`
`206`	`206`
`207`	`207`	`T& result()`
`208`	`208`	`{`
`209`		`- rethrow_if_unhandled_exception();`
	`209`	`+ this->rethrow_if_unhandled_exception();`
`210`	`210`	`return reinterpret_cast<T>(&m_valueStorage);`
`211`	`211`	`}`
`212`	`212`
`@@ -236,7 +236,7 @@ namespace cppcoro`
`236`	`236`
`237`	`237`	`void result()`
`238`	`238`	`{`
`239`		`- rethrow_if_unhandled_exception();`
	`239`	`+ this->rethrow_if_unhandled_exception();`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`};`
`@@ -260,7 +260,7 @@ namespace cppcoro`
`260`	`260`
`261`	`261`	`T& result()`
`262`	`262`	`{`
`263`		`- rethrow_if_unhandled_exception();`
	`263`	`+ this->rethrow_if_unhandled_exception();`
`264`	`264`	`return *m_value;`
`265`	`265`	`}`
`266`	`266`
`@@ -387,12 +387,12 @@ namespace cppcoro`
`387`	`387`
`388`	`388`	`decltype(auto) await_resume()`
`389`	`389`	`{`
`390`		`- if (!m_coroutine)`
	`390`	`+ if (!this->m_coroutine)`
`391`	`391`	`{`
`392`	`392`	`throw broken_promise{};`
`393`	`393`	`}`
`394`	`394`
`395`		`- return m_coroutine.promise().result();`
	`395`	`+ return this->m_coroutine.promise().result();`
`396`	`396`	`}`
`397`	`397`	`};`
`398`	`398`
Original file line number	Diff line number	Diff line change
`@@ -341,12 +341,12 @@ namespace cppcoro`
`341`	`341`
`342`	`342`	`decltype(auto) await_resume()`
`343`	`343`	`{`
`344`		`- if (!m_coroutine)`
	`344`	`+ if (!this->m_coroutine)`
`345`	`345`	`{`
`346`	`346`	`throw broken_promise{};`
`347`	`347`	`}`
`348`	`348`
`349`		`- return m_coroutine.promise().result();`
	`349`	`+ return this->m_coroutine.promise().result();`
`350`	`350`	`}`
`351`	`351`	`};`
`352`	`352`
`@@ -361,12 +361,12 @@ namespace cppcoro`
`361`	`361`
`362`	`362`	`decltype(auto) await_resume()`
`363`	`363`	`{`
`364`		`- if (!m_coroutine)`
	`364`	`+ if (!this->m_coroutine)`
`365`	`365`	`{`
`366`	`366`	`throw broken_promise{};`
`367`	`367`	`}`
`368`	`368`
`369`		`- return std::move(m_coroutine.promise()).result();`
	`369`	`+ return std::move(this->m_coroutine.promise()).result();`
`370`	`370`	`}`
`371`	`371`	`};`
`372`	`372`