commit d42e89341935a4f8f710ae3dba3539583b25b9ff
author Dan Albert <danalbert@google.com> Fri Mar 27 06:35:13 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 27 06:35:14 2015 +0000
tree 6064371056594b105e18536e0c7d6a87a8e73eb5
parent 210e2ae6d3b0c94c3a4dc283e52ad8da67ca2b54
parent dc5c74f40aead248a663ddb08a12634443144210

Merge "Include what we use."

base/logging.cpp

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>

base/strings.cpp

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>