diff options
| author | Yuri Gorshenin <y@maps.me> | 2017-04-19 14:08:23 +0300 |
|---|---|---|
| committer | Vladimir Byko-Ianko <bykoianko@gmail.com> | 2017-04-19 15:08:21 +0300 |
| commit | 02483b4948479ec463c737b6db77dbc3db015079 (patch) | |
| tree | a068eac65bab140b0655869d738b2e9999bee145 /3party | |
| parent | 6d3583c937b1878c8f796e659ef03d038cde17ab (diff) | |
Review fixes.
Diffstat (limited to '3party')
| -rw-r--r-- | 3party/jansson/myjansson.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/3party/jansson/myjansson.cpp b/3party/jansson/myjansson.cpp index 0b853747da..2987c51f17 100644 --- a/3party/jansson/myjansson.cpp +++ b/3party/jansson/myjansson.cpp @@ -7,9 +7,10 @@ using namespace std; namespace { template <typename T> -typename enable_if<is_integral<T>::value, void>::type ReadIntegral(json_t * root, - string const & field, T & result) +void ReadIntegral(json_t * root, string const & field, T & result) { + static_assert(is_integral<T>::value, "T must be an integral type"); + auto * val = my::GetJSONObligatoryField(root, field); if (!json_is_number(val)) MYTHROW(my::Json::Exception, ("The field", field, "must contain a json number.")); @@ -17,10 +18,10 @@ typename enable_if<is_integral<T>::value, void>::type ReadIntegral(json_t * root } template <typename T> -typename enable_if<is_integral<T>::value, void>::type ReadIntegralOptional(json_t * root, - string const & field, - T & result) +void ReadIntegralOptional(json_t * root, string const & field, T & result) { + static_assert(is_integral<T>::value, "T must be an integral type"); + auto * val = my::GetJSONOptionalField(root, field); if (!val) { |