diff options
| author |  Mike Klein <mtklein@google.com> | 2018-06-13 18:55:55 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-13 18:56:07 +0000 |
| commit | a2bf58515ae2d55882668287c8d0ee77e01f0fe8 (patch) | |
| tree | 18e9b86a94ff4349ef811c361862a3e998dc50e7 /include/private/SkTFitsIn.h | |
| parent | 2f14f21acbd291933e13e8eef822fd222d20c677 (diff) | |
Revert "use std::enable_if instead of assert()"
This reverts commit c6530d1e5ecce640e0255d66a01f9db73add7df9.
Reason for revert: going to revert SkTFitsIn refactor temporarily
Original change's description:
> use std::enable_if instead of assert()
>
> Crazy? Genius?
>
> Change-Id: I6033ab5f1af1a6bee84c27025b988e1143d59293
> Reviewed-on: https://skia-review.googlesource.com/134512
> Commit-Queue: Mike Klein <mtklein@chromium.org>
> Commit-Queue: Ben Wagner <bungeman@google.com>
> Auto-Submit: Mike Klein <mtklein@chromium.org>
> Reviewed-by: Ben Wagner <bungeman@google.com>
TBR=mtklein@chromium.org,bungeman@google.com
Change-Id: Id7c91e3a12756defe194379579cc5fd88fd4b164
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/134620
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'include/private/SkTFitsIn.h')
| -rw-r--r-- | include/private/SkTFitsIn.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/private/SkTFitsIn.h b/include/private/SkTFitsIn.h index 5fdf74383a..9dcfdf3384 100644 --- a/include/private/SkTFitsIn.h +++ b/include/private/SkTFitsIn.h @@ -8,6 +8,7 @@ #ifndef SkTFitsIn_DEFINED #define SkTFitsIn_DEFINED +#include <cassert> #include <limits> #include <type_traits> @@ -52,12 +53,10 @@ */ template <typename D, typename S> -static constexpr inline -typename std::enable_if<(std::is_integral<S>::value || std::is_enum<S>::value) && - (std::is_integral<D>::value || std::is_enum<D>::value), bool>::type -/*bool*/ SkTFitsIn(S src) { +static constexpr inline bool SkTFitsIn(S src) { // SkTFitsIn() is used in public headers, so needs to be written targeting at most C++11. - return + return assert(std::is_integral<S>::value || std::is_enum<S>::value), + assert(std::is_integral<D>::value || std::is_enum<D>::value), // E.g. (int8_t)(uint8_t) int8_t(-1) == -1, but the uint8_t == 255, not -1. (std::is_signed<S>::value && std::is_unsigned<D>::value && sizeof(S) <= sizeof(D)) ? |