aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Vakulenko <avakulenko@google.com>2016-03-28 13:26:51 -0700
committerAlex Vakulenko <avakulenko@google.com>2016-03-29 15:05:44 +0000
commitb9bbdc69c86ce7a1b8f2221fba4fe8f50fd6b9a8 (patch)
tree0e75e8583b9acbce3e55c39096877a1ba53f6cb5
parent5c2870f2620a7a7840d1e57a2a306ddaa67832af (diff)
downloadlibweave-b9bbdc69c86ce7a1b8f2221fba4fe8f50fd6b9a8.tar.gz
libweave: Fix compile errors on Chrome OS
Need to include <algorithm> explicitly to use std::find and std::replace. On Android these included indirectly by some other library headers, but on Chrome OS they are not and this breaks the build. Change-Id: I590e00aaaa3796a6614147bd5acb404c2fe078d6 Reviewed-on: https://weave-review.googlesource.com/3063 Reviewed-by: Robert Ginda <rginda@google.com>
-rw-r--r--src/config.cc2
-rw-r--r--src/test/unittest_utils.cc2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/config.cc b/src/config.cc
index cd28de9..108c6aa 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -4,6 +4,8 @@
#include "src/config.h"
+
+#include <algorithm>
#include <set>
#include <base/bind.h>
diff --git a/src/test/unittest_utils.cc b/src/test/unittest_utils.cc
index df8ccc0..2176e7f 100644
--- a/src/test/unittest_utils.cc
+++ b/src/test/unittest_utils.cc
@@ -4,6 +4,8 @@
#include <weave/test/unittest_utils.h>
+#include <algorithm>
+
#include <base/json/json_reader.h>
#include <base/json/json_writer.h>
#include <base/logging.h>