Changeset a1c35cc in mainline for uspace/lib/cpp/include/internal/locale.hpp

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

File:

• uspace/lib/cpp/include/internal/locale.hpp (modified) (2 diffs)

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>();