aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLuis Hector Chavez <lhchavez@google.com>2016-05-20 23:09:12 -0700
committerLuis Hector Chavez <lhchavez@google.com>2016-05-27 20:33:51 +0000
commit637be7990843742d7ac6910ea909dcb09e9df175 (patch)
treef6c3acf0a40a22d05c8f58a06edf689a06c5d791 /include
parentd1f98a07056edc27b2b5b8b780f761796a1d8b1d (diff)
downloadlibweave-637be7990843742d7ac6910ea909dcb09e9df175.tar.gz
libweave: Update libchrome APIs to r395517
The new libchrome has been ported from Chromium and some APIs have changed. Make necessary changes at call sites. BUG: 28985443 TEST: All tests in libweave_test pass on dragonboard-eng build TEST: make testall Change-Id: Iccc8acbd968bc104af44a9053570edf028323cf5 Reviewed-on: https://weave-review.googlesource.com/3611 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
Diffstat (limited to 'include')
-rw-r--r--include/weave/provider/test/fake_task_runner.h1
-rw-r--r--include/weave/settings.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/include/weave/provider/test/fake_task_runner.h b/include/weave/provider/test/fake_task_runner.h
index 9476d02..9a06a8e 100644
--- a/include/weave/provider/test/fake_task_runner.h
+++ b/include/weave/provider/test/fake_task_runner.h
@@ -9,6 +9,7 @@
#include <algorithm>
#include <queue>
+#include <memory>
#include <utility>
#include <vector>
diff --git a/include/weave/settings.h b/include/weave/settings.h
index 2dceedb..2ebc4f2 100644
--- a/include/weave/settings.h
+++ b/include/weave/settings.h
@@ -13,7 +13,7 @@
namespace weave {
// Scopes in order of increasing privileges.
-enum class AuthScope {
+enum class AuthScope : int32_t {
kNone,
kViewer,
kUser,