Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fc6f441 authored by Christopher Wiley's avatar Christopher Wiley Committed by Gerrit Code Review
Browse files

Merge "Do not merge namespaces"

parents ea288fd3 1eaa9ed3

tools/aidl/AST.h

+3 −1
Original line number Diff line number Diff line
@@ -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

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ 
#include <string>

#include <vector>



using namespace std;

using std::string;

using std::vector;



class Type

{

tools/aidl/aidl.cpp

+4 −1
Original line number Diff line number Diff line
@@ -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

+2 −1
Original line number Diff line number Diff line
@@ -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

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ 
#include <string>

#include <vector>



using namespace std;

using std::string;

using std::vector;



enum {

    COMPILE_AIDL,