diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2016-05-07 21:19:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-07 21:19:49 +0000 |
| commit | 03eb01f7ee639d3d6f6dcc384241e874eda4e547 (patch) | |
| tree | 20bfc97673994865feda879b520daf29f893be10 | |
| parent | 591ea4a328143c3f2a1488564203d1f1f77422b3 (diff) | |
| parent | 41de19aceff537ddd7263780e35234544ba491a2 (diff) | |
| download | chromium-libpac-03eb01f7ee639d3d6f6dcc384241e874eda4e547.tar.gz | |
Merge "Fix a compiler warning in chromium-libpac." am: 04b4609ade
am: 41de19acef
* commit '41de19aceff537ddd7263780e35234544ba491a2':
Fix a compiler warning in chromium-libpac.
Change-Id: I0670f987bb5e1a7b2bdd00f87373b363207dfcf0
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | src/net_util.cc | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -18,6 +18,7 @@ LOCAL_CFLAGS += \ -Wno-import \ -Wno-format \ -Wno-unused-parameter \ + -Werror LOCAL_C_INCLUDES += $(LOCAL_PATH)/src $(LOCAL_PATH)/../v8 diff --git a/src/net_util.cc b/src/net_util.cc index 992cdd1..8eef03a 100644 --- a/src/net_util.cc +++ b/src/net_util.cc @@ -64,7 +64,7 @@ bool ParseCIDRBlock(const std::string& cidr_literal, // <IPv6-literal> "/" <number of bits> std::vector<std::string> parts; - unsigned int split = cidr_literal.find('/'); + size_t split = cidr_literal.find('/'); if (split == std::string::npos) return false; parts.push_back(cidr_literal.substr(0, split)); |