commit b8e01b9a943e0edf6332765964a4b48a6377aaf5
author Jooyung Han <jooyung@google.com> Sun Nov 01 16:49:13 2020 +0900
committer Jooyung Han <jooyung@google.com> Wed Nov 04 10:08:02 2020 +0900
tree 71cf48702d284a2728ad7a287e596d737ff27c5c
parent 74b1dd4b6b09d9fc46616bd49e920bdc97f7c2dd

gen_log: prints parcelable/union/enum types

User defined types are printed using toString().

Bug: 161439795
Test: aidl_integration_test
Change-Id: I10fbac5f268d19791899129e339dd7c64638be99

aidl_unittest.cpp

diff --git a/aidl_unittest.cpp b/aidl_unittest.cpp
index df29b8c..6c4b2f0 100644
--- a/aidl_unittest.cpp
+++ b/aidl_unittest.cpp
@@ -3065,9 +3065,15 @@
     static const std::string DESCIPTOR = "a.Foo";
     return DESCIPTOR;
   }
-  template <typename _T, ::std::enable_if_t<::std::is_same_v<::std::string, decltype(std::declval<_T>().toString())>, int> = 0>
-  static inline ::std::string _call_toString(const _T& _t) { return _t.toString(); }
-  static inline ::std::string _call_toString(...) { return "{no toString() implemented}"; }
+  template <typename _T> class _has_toString {
+    template <typename _U> static std::true_type __has_toString(decltype(&_U::toString));
+    template <typename _U> static std::false_type __has_toString(...);
+    public: enum { value = decltype(__has_toString<_T>(nullptr))::value };
+  };
+  template <typename _T> inline static std::string _call_toString(const _T& t) {
+    if constexpr (_has_toString<_T>::value) return t.toString();
+    return "{no toString() implemented}";
+  }
   inline std::string toString() const {
     std::ostringstream os;
     os << "Foo{";
@@ -3211,9 +3217,15 @@
   binder_status_t readFromParcel(const AParcel* _parcel);
   binder_status_t writeToParcel(AParcel* _parcel) const;
   static const ::ndk::parcelable_stability_t _aidl_stability = ::ndk::STABILITY_LOCAL;
-  template <typename _T, ::std::enable_if_t<::std::is_same_v<::std::string, decltype(std::declval<_T>().toString())>, int> = 0>
-  static inline ::std::string _call_toString(const _T& _t) { return _t.toString(); }
-  static inline ::std::string _call_toString(...) { return "{no toString() implemented}"; }
+  template <typename _T> class _has_toString {
+    template <typename _U> static std::true_type __has_toString(decltype(&_U::toString));
+    template <typename _U> static std::false_type __has_toString(...);
+    public: enum { value = decltype(__has_toString<_T>(nullptr))::value };
+  };
+  template <typename _T> inline static std::string _call_toString(const _T& t) {
+    if constexpr (_has_toString<_T>::value) return t.toString();
+    return "{no toString() implemented}";
+  }
   inline std::string toString() const {
     std::ostringstream os;
     os << "Foo{";