From 52e54a68e5916997708e8b17943cf2ba72805b30 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Tue, 7 Aug 2018 08:13:13 -0700 Subject: [PATCH] llkd: switch to std::literals Replace std::string("") with ""s Test: build Bug: 33808187 Bug: 111910505 Bug: 80502612 Change-Id: I8c7915b26719081d93f486c22d9a40b4ad548085 --- llkd/libllkd.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/llkd/libllkd.cpp b/llkd/libllkd.cpp index f357cc2ca..3b2877560 100644 --- a/llkd/libllkd.cpp +++ b/llkd/libllkd.cpp @@ -55,6 +55,7 @@ using namespace std::chrono_literals; using namespace std::chrono; +using namespace std::literals; namespace { @@ -497,8 +498,7 @@ void llkPanicKernel(bool dump, pid_t tid, const char* state) { } ::usleep(200000); // let everything settle } - llkWriteStringToFile(std::string("SysRq : Trigger a crash : 'livelock,") + state + "'\n", - "/dev/kmsg"); + llkWriteStringToFile("SysRq : Trigger a crash : 'livelock,"s + state + "'\n", "/dev/kmsg"); android::base::WriteStringToFd("c", sysrqTriggerFd); // NOTREACHED // DYB @@ -1070,7 +1070,7 @@ bool llkInit(const char* threadname) { std::to_string(kthreaddPid) + "," + std::to_string(::getpid()) + "," + std::to_string(::gettid()) + "," LLK_BLACKLIST_PROCESS_DEFAULT); if (threadname) { - defaultBlacklistProcess += std::string(",") + threadname; + defaultBlacklistProcess += ","s + threadname; } for (int cpu = 1; cpu < get_nprocs_conf(); ++cpu) { defaultBlacklistProcess += ",[watchdog/" + std::to_string(cpu) + "]";