commit 3fc6f441ac88aff88a9c474bd1ae93dfde3ed11a
author Christopher Wiley <wiley@google.com> Fri Aug 28 23:09:50 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 28 23:09:50 2015 +0000
tree 1573527fc45b03acf1dae8c0980049633ae50a17
parent ea288fd3d4272cc6cd5da94b942fc4cfdc76e030
parent 1eaa9ed33488bbc8fe3d9185fd053e5aa1246681

Merge "Do not merge namespaces"

tools/aidl/AST.h

diff --git a/tools/aidl/AST.h b/tools/aidl/AST.h
index ead5e7a..8eaf0ad 100644
--- a/tools/aidl/AST.h
+++ b/tools/aidl/AST.h
@@ -7,7 +7,9 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-using namespace std;
+using std::set;
+using std::string;
+using std::vector;
 
 class Type;
 

tools/aidl/Type.h

diff --git a/tools/aidl/Type.h b/tools/aidl/Type.h
index ae12720..dfb80ac 100644
--- a/tools/aidl/Type.h
+++ b/tools/aidl/Type.h
@@ -5,7 +5,8 @@
 #include <string>
 #include <vector>
 
-using namespace std;
+using std::string;
+using std::vector;
 
 class Type
 {

tools/aidl/aidl.cpp

diff --git a/tools/aidl/aidl.cpp b/tools/aidl/aidl.cpp
index 438007f..2d8f0ac 100644
--- a/tools/aidl/aidl.cpp
+++ b/tools/aidl/aidl.cpp
@@ -31,7 +31,10 @@
 #define MIN_USER_SET_METHOD_ID                0
 #define MAX_USER_SET_METHOD_ID                16777214
 
-using namespace std;
+using std::map;
+using std::set;
+using std::string;
+using std::vector;
 
 static void
 test_document(document_item_type* d)

tools/aidl/generate_java.h

diff --git a/tools/aidl/generate_java.h b/tools/aidl/generate_java.h
index 4bfcfeb..be32364 100644
--- a/tools/aidl/generate_java.h
+++ b/tools/aidl/generate_java.h
@@ -6,7 +6,8 @@
 
 #include <string>
 
-using namespace std;
+using std::string;
+using std::vector;
 
 int generate_java(const string& filename, const string& originalSrc,
                 interface_type* iface);

tools/aidl/options.h

diff --git a/tools/aidl/options.h b/tools/aidl/options.h
index 387e37d..53ac4781 100644
--- a/tools/aidl/options.h
+++ b/tools/aidl/options.h
@@ -5,7 +5,8 @@
 #include <string>
 #include <vector>
 
-using namespace std;
+using std::string;
+using std::vector;
 
 enum {
     COMPILE_AIDL,

tools/aidl/options_test.cpp

diff --git a/tools/aidl/options_test.cpp b/tools/aidl/options_test.cpp
index bd106ce..7ac527d 100644
--- a/tools/aidl/options_test.cpp
+++ b/tools/aidl/options_test.cpp
@@ -3,7 +3,8 @@
 
 const bool VERBOSE = false;
 
-using namespace std;
+using std::string;
+using std::vector;
 
 struct Answer {
     const char* argv[8];

tools/aidl/search_path.h

diff --git a/tools/aidl/search_path.h b/tools/aidl/search_path.h
index 2bf94b1..9dd199e 100644
--- a/tools/aidl/search_path.h
+++ b/tools/aidl/search_path.h
@@ -6,7 +6,10 @@
 #if __cplusplus
 #include <vector>
 #include <string>
-using namespace std;
+
+using std::string;
+using std::vector;
+
 extern "C" {
 #endif