hwpplayer1/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

time: Remove overflow error checking (currently breaks ADO builds).

Browse source
This commit is contained in:
bunnei 2020-01-04 03:09:56 -05:00
parent a4e840181c
commit 361285add9
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/hle/service/time/clock_types.h
View file

@ -4,8 +4,6 @@
#pragma once #pragma once
#include <boost/safe_numerics/safe_integer.hpp>
#include "common/common_funcs.h" #include "common/common_funcs.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "common/uuid.h" #include "common/uuid.h"
@ -26,13 +24,7 @@ struct SteadyClockTimePoint {
return ERROR_TIME_MISMATCH; return ERROR_TIME_MISMATCH;
} }
const boost::safe_numerics::safe<s64> this_time_point{time_point}; span = other.time_point - time_point;
const boost::safe_numerics::safe<s64> other_time_point{other.time_point};
try {
span = other_time_point - this_time_point;
} catch (const std::exception&) {
return ERROR_OVERFLOW;
}
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }

10
src/core/hle/service/time/time_zone_manager.cpp
View file

@ -4,8 +4,6 @@
#include <climits> #include <climits>
#include <boost/safe_numerics/safe_integer.hpp>
#include "common/assert.h" #include "common/assert.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "core/file_sys/content_archive.h" #include "core/file_sys/content_archive.h"
@ -77,13 +75,7 @@ struct CalendarTimeInternal {
template <typename TResult, typename TOperand> template <typename TResult, typename TOperand>
static bool SafeAdd(TResult& result, TOperand op) { static bool SafeAdd(TResult& result, TOperand op) {
const boost::safe_numerics::safe<TResult> safe_result{result}; result = result + op;
const boost::safe_numerics::safe<TOperand> safe_op{op};
try {
result = safe_result + safe_op;
} catch (const std::exception&) {
return {}; // Failed with undefined behavior
}
return true; return true;
} }