diff options
author | Alex Vakulenko <avakulenko@google.com> | 2016-03-17 10:36:19 -0700 |
---|---|---|
committer | Alex Vakulenko <avakulenko@google.com> | 2016-03-21 08:28:30 -0700 |
commit | 45779228f8c9e40851cfd23f727e2bd8ffdd4714 (patch) | |
tree | 6673daa05f208c2d2f2f1ad7e14f6c7a2d1e85ce /base/location.h | |
parent | 1a84f3b092fffe0c515acad230c10131a66cfd0e (diff) | |
download | libchrome-45779228f8c9e40851cfd23f727e2bd8ffdd4714.tar.gz |
Update libchrome to r381699
TEST=Build all
Change-Id: I962a83a044a102515c316d04bb65e7c9302e0f0c
Diffstat (limited to 'base/location.h')
-rw-r--r-- | base/location.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/location.h b/base/location.h index d3bb23c63e..21e270c5a9 100644 --- a/base/location.h +++ b/base/location.h @@ -11,7 +11,7 @@ #include <string> #include "base/base_export.h" -#include "base/containers/hash_tables.h" +#include "base/hash.h" namespace tracked_objects { @@ -59,7 +59,7 @@ class BASE_EXPORT Location { // it comes from __FILE__, so no need to check the contents of the string. // See the definition of FROM_HERE in location.h, and how it is used // elsewhere. - return base::HashPair(reinterpret_cast<uintptr_t>(location.file_name()), + return base::HashInts(reinterpret_cast<uintptr_t>(location.file_name()), location.line_number()); } }; |