From 8a7efcdcd2b565d2f03a45a79d0563f7b3ab7f8e Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Wed, 13 Aug 2014 14:43:21 +0800 Subject: [PATCH] Fix compilation error on Linux. --- atom/browser/atom_access_token_store.cc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/atom/browser/atom_access_token_store.cc b/atom/browser/atom_access_token_store.cc index 6555ac76aea1..af0f3c1b27db 100644 --- a/atom/browser/atom_access_token_store.cc +++ b/atom/browser/atom_access_token_store.cc @@ -4,6 +4,8 @@ #include "atom/browser/atom_access_token_store.h" +#include + #include "atom/browser/atom_browser_context.h" #include "atom/browser/net/atom_url_request_context_getter.h" @@ -33,7 +35,14 @@ AtomAccessTokenStore::~AtomAccessTokenStore() { void AtomAccessTokenStore::LoadAccessTokens( const LoadAccessTokensCallbackType& callback) { AccessTokenSet access_token_set; - access_token_set[GURL(kGeolocationProviderUrl)]; + + // Equivelent to access_token_set[kGeolocationProviderUrl]. + // Somehow base::string16 is causing compilation errors when used in a pair + // of std::map on Linux, this can work around it. + std::pair token_pair; + token_pair.first = GURL(kGeolocationProviderUrl); + access_token_set.insert(token_pair); + callback.Run(access_token_set, AtomBrowserContext::Get()->url_request_context_getter()); }