summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert2015-03-27 01:35:13 -0500
committerGerrit Code Review2015-03-27 01:35:14 -0500
commit5188d556d1530b3675dab2fc30dcc17432aa0718 (patch)
tree6064371056594b105e18536e0c7d6a87a8e73eb5
parent6ccfabcf5d547a04a1e6c5237f20670230a7f6a4 (diff)
parent4b3f533be9a29bc44fae6a94cdbbdc8eb1adaa3c (diff)
downloadplatform-system-core-5188d556d1530b3675dab2fc30dcc17432aa0718.tar.gz
platform-system-core-5188d556d1530b3675dab2fc30dcc17432aa0718.tar.xz
platform-system-core-5188d556d1530b3675dab2fc30dcc17432aa0718.zip
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 8bfb20462..38ee2afd4 100644
--- a/base/logging.cpp
+++ b/base/logging.cpp
@@ -18,6 +18,7 @@
18 18
19#include <iostream> 19#include <iostream>
20#include <limits> 20#include <limits>
21#include <mutex>
21#include <sstream> 22#include <sstream>
22#include <string> 23#include <string>
23#include <vector> 24#include <vector>
diff --git a/base/strings.cpp b/base/strings.cpp
index 5f7eccc3f..6f698d9a7 100644
--- a/base/strings.cpp
+++ b/base/strings.cpp
@@ -17,6 +17,7 @@
17#include "base/strings.h" 17#include "base/strings.h"
18 18
19#include <stdlib.h> 19#include <stdlib.h>
20#include <string.h>
20 21
21#include <string> 22#include <string>
22#include <vector> 23#include <vector>