From f85129d4d77a447984241dbc1babd31b1eb1dd4e Mon Sep 17 00:00:00 2001
From: josh macdonald <josh.macdonald@code.google.com>
Date: Tue, 5 Feb 2013 22:12:13 -0800
Subject: [PATCH] Fixes for open-source build following upstream bug fix

---
 btree_test.cc | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/btree_test.cc b/btree_test.cc
index 52bd219..6b1837d 100644
--- a/btree_test.cc
+++ b/btree_test.cc
@@ -245,14 +245,17 @@ TEST(Btree, Comparison) {
 }
 
 TEST(Btree, RangeCtorSanity) {
-  typedef btree_set<int, less<int>, allocator<int>, 256> test_set;
-  typedef btree_map<int, int, less<int>, allocator<int>, 256> test_map;
-  typedef btree_multiset<int, less<int>, allocator<int>, 256> test_mset;
-  typedef btree_multimap<int, int, less<int>, allocator<int>, 256> test_mmap;
-  vector<int> ivec;
+  typedef btree_set<int, std::less<int>, std::allocator<int>, 256> test_set;
+  typedef btree_map<int, int, std::less<int>, std::allocator<int>, 256> 
+      test_map;
+  typedef btree_multiset<int, std::less<int>, std::allocator<int>, 256> 
+      test_mset;
+  typedef btree_multimap<int, int, std::less<int>, std::allocator<int>, 256> 
+      test_mmap;
+  std::vector<int> ivec;
   ivec.push_back(1);
-  map<int, int> imap;
-  imap.insert(make_pair(1, 2));
+  std::map<int, int> imap;
+  imap.insert(std::make_pair(1, 2));
   test_mset tmset(ivec.begin(), ivec.end());
   test_mmap tmmap(imap.begin(), imap.end());
   test_set tset(ivec.begin(), ivec.end());