Index: uspace/lib/cpp/src/string.cpp
===================================================================
--- uspace/lib/cpp/src/string.cpp	(revision d93f01a6395c7e44b29a615726ddb6aefe9b26b3)
+++ uspace/lib/cpp/src/string.cpp	(revision 49343fe1aa5aa5bc541b46f5f476961d249ba819)
@@ -40,5 +40,5 @@
     {
         char* end;
-        long result = strtol(str.c_str(), &end, base);
+        long result = hel::strtol(str.c_str(), &end, base);
 
         if (end != str.c_str())
@@ -56,5 +56,5 @@
     {
         char* end;
-        unsigned long result = strtoul(str.c_str(), &end, base);
+        unsigned long result = hel::strtoul(str.c_str(), &end, base);
 
         if (end != str.c_str())
@@ -102,5 +102,5 @@
     {
         char* tmp;
-        asprintf(&tmp, "%d", val);
+        hel::asprintf(&tmp, "%d", val);
 
         std::string res{tmp};
@@ -113,5 +113,5 @@
     {
         char* tmp;
-        asprintf(&tmp, "%u", val);
+        hel::asprintf(&tmp, "%u", val);
 
         std::string res{tmp};
@@ -124,5 +124,5 @@
     {
         char* tmp;
-        asprintf(&tmp, "%ld", val);
+        hel::asprintf(&tmp, "%ld", val);
 
         std::string res{tmp};
@@ -135,5 +135,5 @@
     {
         char* tmp;
-        asprintf(&tmp, "%lu", val);
+        hel::asprintf(&tmp, "%lu", val);
 
         std::string res{tmp};
@@ -146,5 +146,5 @@
     {
         char* tmp;
-        asprintf(&tmp, "%lld", val);
+        hel::asprintf(&tmp, "%lld", val);
 
         std::string res{tmp};
@@ -157,5 +157,5 @@
     {
         char* tmp;
-        asprintf(&tmp, "%llu", val);
+        hel::asprintf(&tmp, "%llu", val);
 
         std::string res{tmp};
@@ -168,5 +168,5 @@
     {
         char* tmp;
-        asprintf(&tmp, "%f", val);
+        hel::asprintf(&tmp, "%f", val);
 
         std::string res{tmp};
@@ -179,5 +179,5 @@
     {
         char* tmp;
-        asprintf(&tmp, "%f", val);
+        hel::asprintf(&tmp, "%f", val);
 
         std::string res{tmp};
@@ -190,5 +190,5 @@
     {
         char* tmp;
-        asprintf(&tmp, "%Lf", val);
+        hel::asprintf(&tmp, "%Lf", val);
 
         std::string res{tmp};
@@ -299,10 +299,4 @@
         return wstring{};
     }
-
-    /**
-     * 21.6, hash support:
-     */
-
-    // TODO: implement
 
     /**
@@ -319,4 +313,7 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wliteral-suffix"
+inline namespace literals {
+inline namespace string_literals
+{
     string operator "" s(const char* str, size_t len)
     {
@@ -340,4 +337,5 @@
     }
     */
+}}
 #pragma GCC diagnostic pop
 }