Merge changes from topic 'libutils-remove-string'
* changes:
storaged: remove usage of String16::std_string
Add missing includes.
diff --git a/libutils/Printer.cpp b/libutils/Printer.cpp
index 9573a10..12f77bb 100644
--- a/libutils/Printer.cpp
+++ b/libutils/Printer.cpp
@@ -21,6 +21,8 @@
#include <utils/String8.h>
#include <utils/Log.h>
+#include <stdlib.h>
+
namespace android {
/*
diff --git a/libutils/ProcessCallStack.cpp b/libutils/ProcessCallStack.cpp
index 1d9f30d..ff8b32a 100644
--- a/libutils/ProcessCallStack.cpp
+++ b/libutils/ProcessCallStack.cpp
@@ -20,6 +20,7 @@
#include <utils/ProcessCallStack.h>
#include <dirent.h>
+#include <memory>
#include <utils/Printer.h>
diff --git a/libutils/String16.cpp b/libutils/String16.cpp
index 12bb7c4..ad335c3 100644
--- a/libutils/String16.cpp
+++ b/libutils/String16.cpp
@@ -18,6 +18,8 @@
#include <utils/Log.h>
+#include <ctype.h>
+
#include "SharedBuffer.h"
namespace android {
diff --git a/libutils/String8.cpp b/libutils/String8.cpp
index 0ac39f9..ad0e72e 100644
--- a/libutils/String8.cpp
+++ b/libutils/String8.cpp
@@ -23,6 +23,8 @@
#include <utils/Log.h>
#include <utils/String16.h>
+#include <ctype.h>
+
#include "SharedBuffer.h"
/*
diff --git a/storaged/storaged_service.cpp b/storaged/storaged_service.cpp
index a335298..f968ed7 100644
--- a/storaged/storaged_service.cpp
+++ b/storaged/storaged_service.cpp
@@ -97,19 +97,19 @@
if (arg == String16("--hours")) {
if (++i >= args.size())
break;
- hours = stod(String16::std_string(args[i]));
+ hours = std::stod(String8(args[i]).string());
continue;
}
if (arg == String16("--time_window")) {
if (++i >= args.size())
break;
- time_window = stoi(String16::std_string(args[i]));
+ time_window = std::stoi(String8(args[i]).string());
continue;
}
if (arg == String16("--threshold")) {
if (++i >= args.size())
break;
- threshold = stoll(String16::std_string(args[i]));
+ threshold = std::stoll(String8(args[i]).string());
continue;
}
if (arg == String16("--force")) {