diff options
| author | Christopher Wiley <wiley@google.com> | 2016-04-13 15:10:25 -0700 |
|---|---|---|
| committer | Christopher Wiley <wiley@google.com> | 2016-04-13 22:55:18 +0000 |
| commit | e28b4207c2218c91ee1f172fd27e8c350d941b0f (patch) | |
| tree | 28db218fe8be9217bd2ad53f4b6bde9062ce14a5 | |
| parent | 9419e66f14a093fc18a32fde20daa66cca450453 (diff) | |
| download | webservd-e28b4207c2218c91ee1f172fd27e8c350d941b0f.tar.gz | |
Resolve ambiguous base::File reference
When libchrome includes libbase headers, the compiler looks for
base::File in ::android::base rather than ::base, because we're
inside the android namespace.
Bug: 28117776
Change-Id: I3b423845bfe5bacd1519a8973acf5243e665c315
Test: Compiles in that situation.
| -rw-r--r-- | webservd/binder_request.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webservd/binder_request.cc b/webservd/binder_request.cc index e2a9a8e..96c0a86 100644 --- a/webservd/binder_request.cc +++ b/webservd/binder_request.cc @@ -107,7 +107,7 @@ Status HttpRequest::Respond(int32_t status_code, headers_map.emplace_back(*it, *(it + 1)); } - base::File file = request_->Complete(status_code, headers_map, data_size); + ::base::File file = request_->Complete(status_code, headers_map, data_size); if (!file.IsValid()) { // We've already handled this request |