refactor: move members into AidlDefinedType
AidlDefinedType now handles members(constants, methods, variables).
We don't need to use template functions like:
template <typename TypeWithConstants>
...
Bug: n/a
Test: aidl_integration_test
Test: aidl_unittests
Change-Id: If92cd5146c7d1d9efb128eeb162994d42e23f9d8
diff --git a/aidl_checkapi.cpp b/aidl_checkapi.cpp
index 2dfbdae..d513f5c 100644
--- a/aidl_checkapi.cpp
+++ b/aidl_checkapi.cpp
@@ -101,9 +101,7 @@
return compatible;
}
-template <typename TypeWithConstants>
-static bool are_compatible_constants(const TypeWithConstants& older,
- const TypeWithConstants& newer) {
+static bool are_compatible_constants(const AidlDefinedType& older, const AidlDefinedType& newer) {
bool compatible = true;
map<string, AidlConstantDeclaration*> new_constdecls;
@@ -214,9 +212,8 @@
});
}
-template <typename ParcelableType>
-static bool are_compatible_parcelables(const ParcelableType& older, const AidlTypenames&,
- const ParcelableType& newer,
+static bool are_compatible_parcelables(const AidlDefinedType& older, const AidlTypenames&,
+ const AidlDefinedType& newer,
const AidlTypenames& new_types) {
const auto& old_fields = older.GetFields();
const auto& new_fields = newer.GetFields();