Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1647)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/base/net_util_linux.cc

Issue 835633003: Enable libc++ on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Really fix AOSP Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/base/address_tracker_linux_unittest.cc ('K') | « net/base/address_tracker_linux_unittest.cc ('k') | net/spdy/spdy_prefixed_buffer_reader_test.cc » ('j') | net/spdy/spdy_prefixed_buffer_reader_test.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/net_util_linux.cc
diff --git a/net/base/net_util_linux.cc b/net/base/net_util_linux.cc
index e4e0f7f3277e9110cb944ea0714ea9136f36ea18..07d8078698f6a60998be78b0969fe859b89b701b 100644
--- a/net/base/net_util_linux.cc
+++ b/net/base/net_util_linux.cc
@@ -12,6 +12,7 @@
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
+#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_tokenizer.h"
#include "base/strings/string_util.h"
@@ -62,11 +63,7 @@ bool TryConvertNativeToNetIPAttributes(int native_attributes,
namespace internal {
inline const unsigned char* GetIPAddressData(const IPAddressNumber& ip) {
-#if defined(OS_ANDROID)
- return ip.begin();
-#else
- return ip.data();
-#endif
+ return vector_as_array(&ip);
}
bool GetNetworkListImpl(
« net/base/address_tracker_linux_unittest.cc ('K') | « net/base/address_tracker_linux_unittest.cc ('k') | net/spdy/spdy_prefixed_buffer_reader_test.cc » ('j') | net/spdy/spdy_prefixed_buffer_reader_test.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698