diff options
| author | Christopher Wiley <wiley@google.com> | 2016-04-13 23:05:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-13 23:05:11 +0000 |
| commit | 65181680c6e29691202021352fcd3b737cbf53d8 (patch) | |
| tree | a4519a6c47929b3ee6814bcbe60477da5497c402 | |
| parent | a245419d14c488c7ace335ec9ed7fad25ddd7d6a (diff) | |
| parent | 9d307138240240d972080329234b78627e78a1ee (diff) | |
| download | webservd-65181680c6e29691202021352fcd3b737cbf53d8.tar.gz | |
Resolve ambiguous base::File reference am: e28b420
am: 9d30713
* commit '9d307138240240d972080329234b78627e78a1ee':
Resolve ambiguous base::File reference
Change-Id: Idefef094b65136e81399b845f96d34d8aee040e8
| -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 |