Ignore:
Timestamp:
2019-06-27T08:51:20Z (6 years ago)
Author:
Jaroslav Jindrak <dzejrou@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8add15e0
Parents:
ad40b74b (diff), aeba767 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

cpp: merge and resolve conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/cpp/include/__bits/locale/num_get.hpp

    rad40b74b rbc73be3  
    301301                if (size > 0)
    302302                {
    303                     int ret{};
     303                    int olderrno{errno};
     304                    errno = EOK;
     305                    char *endptr = NULL;
     306
    304307                    if constexpr (is_signed<BaseType>::value)
    305                         ret = std::hel::str_int64_t(base.buffer_, nullptr, num_base, false, &res);
    306                     else
    307                         ret = std::hel::str_uint64_t(base.buffer_, nullptr, num_base, false, &res);
    308 
    309                     if (ret != EOK)
    310                     {
     308                        res = ::strtoll(base.buffer_, &endptr, num_base);
     309                    else
     310                        res = ::strtoull(base.buffer_, &endptr, num_base);
     311
     312                    if (errno != EOK || endptr == base.buffer_)
    311313                        err |= ios_base::failbit;
    312                         v = 0;
    313                     }
    314                     else if (res > static_cast<BaseType>(numeric_limits<T>::max()))
     314
     315                    errno = olderrno;
     316
     317                    if (res > static_cast<BaseType>(numeric_limits<T>::max()))
    315318                    {
    316319                        err |= ios_base::failbit;
Note: See TracChangeset for help on using the changeset viewer.