Changeset bc56f30 in mainline for uspace/lib/cpp/include/__bits/locale/num_get.hpp

Timestamp:

2019-05-27T12:38:26Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0d14c25

Parents:

4d51c60

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-13 16:06:49)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-05-27 12:38:26)

Message:

Make some libc and libposix headers usable in C++

These headers either get included from standard C++ headers,
or are standard themselves, which means any unnamespaced nonstandard
identifiers are a problem. This commit attempts to fix those
issues, and removes hacks previously used in libcpp to work around it.

File:

• uspace/lib/cpp/include/__bits/locale/num_get.hpp (modified) (1 diff)

uspace/lib/cpp/include/__bits/locale/num_get.hpp

@@ -301 +301 @@
                 if (size > 0)
                 {
-                    int ret{};
+                    int olderrno{errno};
+                    errno = EOK;
+
                     if constexpr (is_signed<BaseType>::value)
-                        ret = std::hel::str_int64_t(base.buffer_, nullptr, num_base, false, &res);
-                    else
-                        ret = std::hel::str_uint64_t(base.buffer_, nullptr, num_base, false, &res);
-
-                    if (ret != EOK)
-                    {
+                        res = ::strtoll(base.buffer_, nullptr, num_base);
+                    else
+                        res = ::strtoull(base.buffer_, nullptr, num_base);
+
+                    if (errno != EOK)
                         err |= ios_base::failbit;
-                        v = 0;
-                    }
-                    else if (res > static_cast<BaseType>(numeric_limits<T>::max()))
+
+                    errno = olderrno;
+
+                    if (res > static_cast<BaseType>(numeric_limits<T>::max()))
                     {
                         err |= ios_base::failbit;