summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-03-27 06:35:13 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-27 06:35:14 +0000
commit5188d556d1530b3675dab2fc30dcc17432aa0718 (patch)
tree6064371056594b105e18536e0c7d6a87a8e73eb5
parent6ccfabcf5d547a04a1e6c5237f20670230a7f6a4 (diff)
parent4b3f533be9a29bc44fae6a94cdbbdc8eb1adaa3c (diff)
downloadsystem_core-5188d556d1530b3675dab2fc30dcc17432aa0718.zip
system_core-5188d556d1530b3675dab2fc30dcc17432aa0718.tar.gz
system_core-5188d556d1530b3675dab2fc30dcc17432aa0718.tar.bz2
Merge "Include what we use."
-rw-r--r--base/logging.cpp1
-rw-r--r--base/strings.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/base/logging.cpp b/base/logging.cpp
index 8bfb204..38ee2af 100644
--- a/base/logging.cpp
+++ b/base/logging.cpp
@@ -18,6 +18,7 @@
#include <iostream>
#include <limits>
+#include <mutex>
#include <sstream>
#include <string>
#include <vector>
diff --git a/base/strings.cpp b/base/strings.cpp
index 5f7eccc..6f698d9 100644
--- a/base/strings.cpp
+++ b/base/strings.cpp
@@ -17,6 +17,7 @@
#include "base/strings.h"
#include <stdlib.h>
+#include <string.h>
#include <string>
#include <vector>