Changeset 4fba7ad in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

4dfac1e

Parents:

a1c35cc

git-author:

Dzejrou <dzejrou@…> (2018-05-14 19:27:36)

git-committer:

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

Message:

cpp: moved system_error what logic to runtime_error

Location:

uspace/lib/cpp

Files:

• include/impl/system_error.hpp (modified) (2 diffs)
• src/system_error.cpp (modified) (3 diffs)

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

@@ -31 +31 @@
 
 #include <internal/aux.hpp>
+#include <internal/stringfwd.hpp>
 #include <stdexcept>
 
@@ -340 +341 @@
             const error_code& code() const noexcept;
 
-            const char* what() const noexcept override;
-
         private:
             error_code code_;
-            string what_;
     };
 

uspace/lib/cpp/src/system_error.cpp

@@ -27 +27 @@
  */
 
+#include <cstring>
 #include <functional>
 #include <string>
@@ -263 +264 @@
 
     system_error::system_error(error_code ec, const string& what_arg)
-        : code_{ec}, what_{what_arg}
+        : runtime_error{what_arg.c_str()}, code_{ec}
     { /* DUMMY BODY */ }
 
     system_error::system_error(error_code ec, const char* what_arg)
-        : code_{ec}, what_{what_arg}
+        : runtime_error{what_arg}, code_{ec}
     { /* DUMMY BODY */ }
 
     system_error::system_error(error_code ec)
-        : code_{ec}, what_{}
+        : runtime_error{"system_error"}, code_{ec}
     { /* DUMMY BODY */ }
 
     system_error::system_error(int code, const error_category& cat,
                                const string& what_arg)
-        : code_{code, cat}, what_{what_arg}
+        : runtime_error{what_arg.c_str()}, code_{code, cat}
     { /* DUMMY BODY */ }
 
     system_error::system_error(int code, const error_category& cat,
                                const char* what_arg)
-        : code_{code, cat}, what_{what_arg}
+        : runtime_error{what_arg}, code_{code, cat}
     { /* DUMMY BODY */ }
 
     system_error::system_error(int code, const error_category& cat)
-        : code_{code, cat}, what_{}
+        : runtime_error{"system_error"}, code_{code, cat}
     { /* DUMMY BODY */ }
 
@@ -292 +293 @@
         return code_;
     }
-
-    const char* system_error::what() const noexcept
-    {
-        return what_.c_str();
-    }
 }