Patches to avoid build problems in some Borland environments.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@580 2f5784b3-3f2a-0410-8824-cb99058d5e15

1 files changed, 5 insertions, 6 deletions

diff --git a/pcre_stringpiece_unittest.cc b/pcre_stringpiece_unittest.cc
index 1e821ab..c58e028 100644
--- a/pcre_stringpiece_unittest.cc
+++ b/pcre_stringpiece_unittest.cc
@@ -24,8 +24,6 @@
   }                                                     \
 } while (0)
 
-using std::map;
-using std::make_pair;
 using pcrecpp::StringPiece;
 
 static void CheckSTLComparator() {
@@ -37,12 +35,13 @@ static void CheckSTLComparator() {
   StringPiece p2(s2);
   StringPiece p3(s3);
 
-  typedef map<StringPiece, int> TestMap;
+  typedef std::map<StringPiece, int> TestMap;
   TestMap map;
 
-  map.insert(make_pair(p1, 0));
-  map.insert(make_pair(p2, 1));
-  map.insert(make_pair(p3, 2));
+  map.insert(std::make_pair(p1, 0));
+  map.insert(std::make_pair(p2, 1));
+  map.insert(std::make_pair(p3, 2));
+
   CHECK(map.size() == 3);
 
   TestMap::const_iterator iter = map.begin();