Changeset a1c35cc in mainline

Timestamp:

2018-07-05T21:41:23Z (7 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

4fba7ad

Parents:

349b0f7

git-author:

Dzejrou <dzejrou@…> (2018-05-14 18:08:11)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:23)

Message:

cpp: added missing return statements, changed the way facets work for the moment (we return by value instead of by reference which means we can avoid that ugly leaking hack

Location:

uspace/lib/cpp/include

Files:

• impl/istream.hpp (modified) (2 diffs)
• internal/locale.hpp (modified) (2 diffs)
• internal/locale/num_get.hpp (modified) (7 diffs)

uspace/lib/cpp/include/impl/istream.hpp

@@ -571 +571 @@
                     }
                 }
+
+                return *this;
             }
 
@@ -605 +607 @@
                     s[gcount_++] = traits_type::to_char_type(c);
                 }
+
+                return *this;
             }
 

uspace/lib/cpp/include/internal/locale.hpp

@@ -35 +35 @@
 {
     class locale;
-
-    template<class Facet>
-    const Facet& use_facet(const locale& loc);
-
-    template<class Facet>
-    bool has_facet(const locale& loc);
 
     /**
@@ -152 +146 @@
 
             template<class Facet>
-            friend const Facet& use_facet(const locale&);
+            /* friend const Facet& use_facet(const locale&); */
+            friend Facet use_facet(const locale&);
 
             template<class Facet>
-            const Facet& get_() const
+            /* const Facet& get_() const */
+            Facet get_() const
             {
-                // TODO: A VERY ugly hack, when we have map/shared ptr,
-                //       we should implement facets and store them in a map
-                //       and return them here by their IDs.
-                return *(new Facet{0u});
+                return Facet{0U};
             }
     };
 
     template<class Facet>
-    const Facet& use_facet(const locale& loc)
+    /* const Facet& use_facet(const locale& loc) */
+    Facet use_facet(const locale& loc)
     {
         return loc.get_<Facet>();

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

@@ -30 +30 @@
 #define LIBCPP_INTERNAL_LOCALE_NUM_GET
 
+#include <cerrno>
+#include <cstring>
 #include <internal/locale.hpp>
 #include <internal/locale/numpunct.hpp>
@@ -35 +37 @@
 #include <iterator>
 #include <limits>
-
-extern "C" {
-#include <errno.h>
-}
 
 namespace std
@@ -262 +260 @@
             {
                 // TODO: implement
+                return in;
             }
 
@@ -268 +267 @@
             {
                 // TODO: implement
+                return in;
             }
 
@@ -274 +274 @@
             {
                 // TODO: implement
+                return in;
             }
 
@@ -280 +281 @@
             {
                 // TODO: implement
+                return in;
             }
 
@@ -301 +303 @@
                     int ret{};
                     if constexpr (is_signed<BaseType>::value)
-                        ret = str_int64_t(base.buffer_, nullptr, num_base, false, &res);
-                    else
-                        ret = str_uint64_t(base.buffer_, nullptr, num_base, false, &res);
+                        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)