--- code/trunk/pcre_stringpiece_unittest.cc	2007/03/02 13:10:43	96
+++ code/trunk/pcre_stringpiece_unittest.cc	2010/11/26 11:16:43	580
@@ -1,10 +1,16 @@
 // Copyright 2003 and onwards Google Inc.
 // Author: Sanjay Ghemawat
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <map>
 #include <algorithm>    // for make_pair
-#include <pcre_stringpiece.h>
+
+#include "pcrecpp.h"
+#include "pcre_stringpiece.h"
 
 // CHECK dies with a fatal error if condition is not true.  It is *not*
 // controlled by NDEBUG, so the check will be executed regardless of
@@ -18,8 +24,6 @@
   }                                                     \
 } while (0)
 
-using std::map;
-using std::make_pair;
 using pcrecpp::StringPiece;
 
 static void CheckSTLComparator() {
@@ -31,12 +35,13 @@
   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();