diff options
| author | Luis Hector Chavez <lhchavez@google.com> | 2016-06-01 21:57:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-01 21:57:05 +0000 |
| commit | b20409af35ba1a15cd260567decb8ce9dca1d091 (patch) | |
| tree | 7f57ba7623a0cbf9621452f92e900095242090d5 /examples/provider | |
| parent | d77dfa0b5a854a80a586b89f13f602ee5a523d06 (diff) | |
| parent | 83db8f75afbb37010450a6a5607764dedf20db6b (diff) | |
| download | libweave-nougat-mr1-wear-release.tar.gz | |
Reland "Merge remote-tracking branch \'weave/master\' into \'weave/aosp-master\'"android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
am: 83db8f75af
* commit '83db8f75afbb37010450a6a5607764dedf20db6b':
Reland "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'"
Change-Id: Idac2caa8eb2921e7ee9954a3896f936b793c99a7
Diffstat (limited to 'examples/provider')
| -rw-r--r-- | examples/provider/avahi_client.cc | 1 | ||||
| -rw-r--r-- | examples/provider/avahi_client.h | 1 | ||||
| -rw-r--r-- | examples/provider/event_network.h | 2 | ||||
| -rw-r--r-- | examples/provider/event_task_runner.h | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/examples/provider/avahi_client.cc b/examples/provider/avahi_client.cc index ddd4630..36109c4 100644 --- a/examples/provider/avahi_client.cc +++ b/examples/provider/avahi_client.cc @@ -5,6 +5,7 @@ #include "examples/provider/avahi_client.h" #include <cstdlib> +#include <memory> #include <vector> #include <avahi-common/error.h> diff --git a/examples/provider/avahi_client.h b/examples/provider/avahi_client.h index 7d9b932..f9ba01c 100644 --- a/examples/provider/avahi_client.h +++ b/examples/provider/avahi_client.h @@ -6,6 +6,7 @@ #define LIBWEAVE_EXAMPLES_PROVIDER_AVAHI_CLIENT_H_ #include <map> +#include <memory> #include <string> #include <avahi-client/client.h> diff --git a/examples/provider/event_network.h b/examples/provider/event_network.h index 3aeac24..6a5617f 100644 --- a/examples/provider/event_network.h +++ b/examples/provider/event_network.h @@ -5,6 +5,8 @@ #ifndef LIBWEAVE_EXAMPLES_UBUNTU_EVENT_NETWORK_H_ #define LIBWEAVE_EXAMPLES_UBUNTU_EVENT_NETWORK_H_ +#include <vector> + #include <weave/provider/network.h> #include <base/memory/weak_ptr.h> diff --git a/examples/provider/event_task_runner.h b/examples/provider/event_task_runner.h index 97f9db9..a788950 100644 --- a/examples/provider/event_task_runner.h +++ b/examples/provider/event_task_runner.h @@ -6,6 +6,7 @@ #define LIBWEAVE_EXAMPLES_PROVIDER_EVENT_TASK_RUNNER_H_ #include <queue> +#include <map> #include <utility> #include <vector> |