Fully quality std::* names.

[platform/upstream/libphonenumber.git] / cpp / src / phonenumbers / regexp_cache.cc

diff --git a/cpp/src/phonenumbers/regexp_cache.cc b/cpp/src/phonenumbers/regexp_cache.cc
index 24adc5b..d0365a2 100644 (file)
--- a/cpp/src/phonenumbers/regexp_cache.cc
+++ b/cpp/src/phonenumbers/regexp_cache.cc
@@ -28,12 +28,10 @@ using std::string;
 namespace i18n {
 namespace phonenumbers {
 
-using base::AutoLock;
-
 RegExpCache::RegExpCache(const AbstractRegExpFactory& regexp_factory,
                          size_t min_items)
     : regexp_factory_(regexp_factory),
-#ifdef USE_TR1_UNORDERED_MAP
+#ifdef I18N_PHONENUMBERS_USE_TR1_UNORDERED_MAP
       cache_impl_(new CacheImpl(min_items))
 #else
       cache_impl_(new CacheImpl())
@@ -54,7 +52,7 @@ const RegExp& RegExpCache::GetRegExp(const string& pattern) {
   if (it != cache_impl_->end()) return *it->second;
 
   const RegExp* regexp = regexp_factory_.CreateRegExp(pattern);
-  cache_impl_->insert(make_pair(pattern, regexp));
+  cache_impl_->insert(std::make_pair(pattern, regexp));
   return *regexp;
 }