Index: function_test.cpp
===================================================================
--- function_test.cpp	(revision 52873)
+++ function_test.cpp	(working copy)
@@ -13,8 +13,8 @@
 #include <string>
 #include <utility>
 
-using namespace boost;
-using namespace std;
+using boost::function;
+using std::string;
 
 int global_int;
 
@@ -525,7 +525,7 @@
 static void
 test_one_arg()
 {
-  negate<int> neg;
+  std::negate<int> neg;
 
   function<int (int)> f1(neg);
   BOOST_CHECK(f1(5) == -5);
@@ -607,12 +607,12 @@
 
   add_with_throw_on_copy(const add_with_throw_on_copy&)
   {
-    throw runtime_error("But this CAN'T throw");
+    throw std::runtime_error("But this CAN'T throw");
   }
 
   add_with_throw_on_copy& operator=(const add_with_throw_on_copy&)
   {
-    throw runtime_error("But this CAN'T throw");
+    throw std::runtime_error("But this CAN'T throw");
   }
 };
 
@@ -621,10 +621,10 @@
 {
   add_with_throw_on_copy atc;
   try {
-    boost::function<int (int, int)> f(ref(atc));
+    boost::function<int (int, int)> f(boost::ref(atc));
     BOOST_CHECK(f(1, 3) == 4);
   }
-  catch(runtime_error e) {
+  catch(std::runtime_error e) {
     BOOST_ERROR("Nonthrowing constructor threw an exception");
   }
 }
Index: lambda_test.cpp
===================================================================
--- lambda_test.cpp	(revision 52873)
+++ lambda_test.cpp	(working copy)
@@ -16,7 +16,6 @@
 #include <boost/function.hpp>
 
 using namespace std;
-using namespace boost;
 using namespace boost::lambda;
 
 static unsigned
@@ -27,6 +26,8 @@
 
 int test_main(int, char*[])
 {
+  using boost::function;
+
   function <unsigned(bool, double)> f1 = bind(func_impl, 15, _1, _2);
   function <unsigned(double)>       f2 = bind(f1, false, _1);
   function <unsigned()>             f3 = bind(f2, 4.0);