Macintosh-SW/mpw
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw.git synced 2024-06-18 06:29:32 +00:00
Code Issues Projects Releases Wiki Activity

__with_handle tool_return<void> was losing it's error.

Browse Source
This commit is contained in:
Kelvin Sherlock 2016-08-05 17:15:52 -04:00
parent 68c2f65f15
commit a4fb750886
2 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
macos/tool_return.h
View File

@ -50,6 +50,7 @@ namespace MacOS {
}
public:
typedef T value_type;
tool_return(T value) : _value(value)
{}
@ -116,8 +117,9 @@ namespace MacOS {
{
public:
tool_return()
{}
typedef void value_type;
tool_return() = default;
tool_return(macos_error error) : tool_return_base(error)
{}

40
toolbox/mm.cpp
View File

@ -110,38 +110,56 @@ namespace MM
template<class T>
struct tool_return_base { typedef T type; };
// not quite right.... gets turned to tool_return<void>();
/*
template<>
struct tool_return_base<macos_error> { typedef void type ; };
*/
template<class T>
struct tool_return_base<tool_return<T>> { typedef T type; };
template<class T, class F>
tool_return<T> with_handle_helper(F &&f, HandleInfo &info, typename std::enable_if<!std::is_void<T>::value>::type* = 0) {
tool_return<T> rv = f(info);
template<class T>
struct tool_return_type { typedef tool_return<T> type; };
template<>
struct tool_return_type<MacOS::macos_error> { typedef tool_return<void> type; };
template<class T>
struct tool_return_type<tool_return<T>> { typedef tool_return<T> type; };
template<class T, class FRT, class F>
T with_handle_helper(F &&f, HandleInfo &info, typename std::enable_if<!std::is_void<FRT>::value>::type* = 0) {
T rv = f(info);
return rv;
}
template<class T, class F>
tool_return<void> with_handle_helper(F &&f, HandleInfo &info, typename std::enable_if<std::is_void<T>::value>::type* = 0) {
template<class T, class FRT, class F>
T with_handle_helper(F &&f, HandleInfo &info, typename std::enable_if<std::is_void<FRT>::value>::type* = 0) {
f(info);
return tool_return<void>();
}
template<class F, typename T = typename tool_return_base<typename std::result_of<F(HandleInfo &)>::type>::type>
tool_return<T>
__with_handle(uint32_t handle, F &&f)
template<class F,
typename FRT = typename std::result_of<F(HandleInfo &)>::type, // function return type
typename TRT = typename tool_return_type<FRT>::type> // tool return type.
TRT __with_handle(uint32_t handle, F &&f)
{
const auto iter = HandleMap.find(handle);
if (iter == HandleMap.end()) {
tool_return<T> rv = SetMemError(MacOS::memWZErr);
TRT rv = SetMemError(MacOS::memWZErr);
return rv;
}
auto &info = iter->second;
//tool_return<T> rv = f(info);
tool_return<T> rv = with_handle_helper<T>(std::forward<F>(f), info);
TRT rv = with_handle_helper<TRT, FRT>(std::forward<F>(f), info);
SetMemError(rv.error());
return rv;
}