commit e3550c6679939d2bf5f35c540cd83198ab156fb7
author Christopher Wiley <wiley@google.com> Tue Sep 29 13:26:10 2015 -0700
committer Christopher Wiley <wiley@google.com> Tue Sep 29 16:37:43 2015 -0700
tree 0a1d2b42014257b1a2dc510674a440a9fb0f0173
parent dff80e51334ba15850f21189f47665d2fc846b68

Use C++ TypeNamespace when generating code

Bug: 24472672
Test: unittests pass

Change-Id: I815af3cd3172621255dd8d041bb02d7013ed4cfe

aidl.cpp

diff --git a/aidl.cpp b/aidl.cpp
index 46a9317..e00ed00 100644
--- a/aidl.cpp
+++ b/aidl.cpp
@@ -41,6 +41,7 @@
 #include "os.h"
 #include "parse_helpers.h"
 #include "search_path.h"
+#include "type_cpp.h"
 #include "type_java.h"
 #include "type_namespace.h"
 
@@ -610,7 +611,7 @@
 int compile_aidl_to_cpp(const CppOptions& options) {
   interface_type* interface = nullptr;
   import_info* imports = nullptr;
-  unique_ptr<java::JavaTypeNamespace> types(new java::JavaTypeNamespace());
+  unique_ptr<cpp::TypeNamespace> types(new cpp::TypeNamespace());
   int err = load_and_validate_aidl(std::vector<std::string>{},
                                    options.ImportPaths(),
                                    options.InputFileName(),
@@ -623,7 +624,7 @@
 
   // TODO(wiley) b/23600457 generate a dependency file if requested with -b
 
-  return (cpp::GenerateCpp(options, interface)) ? 0 : 1;
+  return (cpp::GenerateCpp(options, *types, *interface)) ? 0 : 1;
 }
 
 int compile_aidl_to_java(const JavaOptions& options) {