From 6c52c1d30673c19ab127d1cb0b8529519cdd4e6d Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 17 Feb 2012 19:57:12 -0500
Subject: [PATCH] =?UTF-8?q?Purge=20=E2=80=98using=20namespace=20std?=
 =?UTF-8?q?=E2=80=99=20from=20header=20files?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

std::bind and boost::lambda::bind don’t mix.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 src/crypto/crypto.h             | 2 +-
 src/examples/decrypt.cc         | 1 +
 src/examples/encrypt.cc         | 1 +
 src/frontend/terminaloverlay.cc | 1 +
 src/frontend/terminaloverlay.h  | 5 ++++-
 src/network/network.h           | 1 -
 src/network/networktransport.h  | 1 -
 src/network/transportfragment.h | 3 ++-
 src/network/transportsender.cc  | 1 +
 src/network/transportsender.h   | 3 ++-
 src/statesync/user.h            | 4 +++-
 11 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h
index d4d01dd..6cbd21e 100644
--- a/src/crypto/crypto.h
+++ b/src/crypto/crypto.h
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdint.h>
 
-using namespace std;
+using std::string;
 
 long int myatoi( char *str );
 
diff --git a/src/examples/decrypt.cc b/src/examples/decrypt.cc
index d0ee8a8..37f03e1 100644
--- a/src/examples/decrypt.cc
+++ b/src/examples/decrypt.cc
@@ -27,6 +27,7 @@
 #include "crypto.h"
 
 using namespace Crypto;
+using namespace std;
 
 int main( int argc, char *argv[] )
 {
diff --git a/src/examples/encrypt.cc b/src/examples/encrypt.cc
index b752ab8..c406fd1 100644
--- a/src/examples/encrypt.cc
+++ b/src/examples/encrypt.cc
@@ -27,6 +27,7 @@
 #include "crypto.h"
 
 using namespace Crypto;
+using namespace std;
 
 int main( int argc, char *argv[] )
 {
diff --git a/src/frontend/terminaloverlay.cc b/src/frontend/terminaloverlay.cc
index 428af49..1e4d30d 100644
--- a/src/frontend/terminaloverlay.cc
+++ b/src/frontend/terminaloverlay.cc
@@ -25,6 +25,7 @@
 #include "terminaloverlay.h"
 
 using namespace Overlay;
+using std::max;
 
 bool ConditionalOverlay::start_clock( uint64_t local_frame_acked, uint64_t now, unsigned int send_interval )
 {
diff --git a/src/frontend/terminaloverlay.h b/src/frontend/terminaloverlay.h
index 9384e6e..53f58da 100644
--- a/src/frontend/terminaloverlay.h
+++ b/src/frontend/terminaloverlay.h
@@ -28,7 +28,10 @@
 namespace Overlay {
   using namespace Terminal;
   using namespace Network;
-  using namespace std;
+  using std::deque;
+  using std::list;
+  using std::vector;
+  using std::wstring;
 
   enum Validity {
     Pending,
diff --git a/src/network/network.h b/src/network/network.h
index 9cf3130..87500a4 100644
--- a/src/network/network.h
+++ b/src/network/network.h
@@ -28,7 +28,6 @@
 
 #include "crypto.h"
 
-using namespace std;
 using namespace Crypto;
 
 namespace Network {
diff --git a/src/network/networktransport.h b/src/network/networktransport.h
index 05586cd..877eb45 100644
--- a/src/network/networktransport.h
+++ b/src/network/networktransport.h
@@ -29,7 +29,6 @@
 #include "transportsender.h"
 #include "transportfragment.h"
 
-using namespace std;
 
 namespace Network {
   template <class MyState, class RemoteState>
diff --git a/src/network/transportfragment.h b/src/network/transportfragment.h
index 909d614..e3b2739 100644
--- a/src/network/transportfragment.h
+++ b/src/network/transportfragment.h
@@ -25,7 +25,8 @@
 
 #include "transportinstruction.pb.h"
 
-using namespace std;
+using std::vector;
+using std::string;
 using namespace TransportBuffers;
 
 namespace Network {
diff --git a/src/network/transportsender.cc b/src/network/transportsender.cc
index 68ed2b2..621f90f 100644
--- a/src/network/transportsender.cc
+++ b/src/network/transportsender.cc
@@ -24,6 +24,7 @@
 #include "transportfragment.h"
 
 using namespace Network;
+using namespace std;
 
 template <class MyState>
 TransportSender<MyState>::TransportSender( Connection *s_connection, MyState &initial_state )
diff --git a/src/network/transportsender.h b/src/network/transportsender.h
index c957454..82c7bf3 100644
--- a/src/network/transportsender.h
+++ b/src/network/transportsender.h
@@ -28,7 +28,8 @@
 #include "transportstate.h"
 #include "transportfragment.h"
 
-using namespace std;
+using std::list;
+using std::pair;
 using namespace TransportBuffers;
 
 namespace Network {
diff --git a/src/statesync/user.h b/src/statesync/user.h
index d5a57a7..0f0c0fa 100644
--- a/src/statesync/user.h
+++ b/src/statesync/user.h
@@ -26,7 +26,9 @@
 
 #include "parseraction.h"
 
-using namespace std;
+using std::deque;
+using std::list;
+using std::string;
 
 namespace Network {
   enum UserEventType {