diff options
| author | Christopher Wiley <wiley@google.com> | 2015-08-28 23:09:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-28 23:09:50 +0000 |
| commit | 3fc6f441ac88aff88a9c474bd1ae93dfde3ed11a (patch) | |
| tree | 1573527fc45b03acf1dae8c0980049633ae50a17 /tools/aidl/generate_java.h | |
| parent | ea288fd3d4272cc6cd5da94b942fc4cfdc76e030 (diff) | |
| parent | 1eaa9ed33488bbc8fe3d9185fd053e5aa1246681 (diff) | |
Merge "Do not merge namespaces"
Diffstat (limited to 'tools/aidl/generate_java.h')
| -rw-r--r-- | tools/aidl/generate_java.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aidl/generate_java.h b/tools/aidl/generate_java.h index 4bfcfeba07c8..be32364410a3 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); |