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

Commit 04cc6b94 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge changes Ibe63610f,I5d589d75 am: ee436e4f am: a3133ee1 am: 84b301bb 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2288496



Change-Id: I8fb776f76311dbe88f83639fcbd8da801a66fddc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed8e7174 84b301bb

libs/binder/ndk/include_cpp/android/binder_to_string.h

+12 −5
Original line number Original line Diff line number Diff line
@@ -113,6 +113,8 @@ class IsPointerLike { 
#endif

#endif

                    IsInstantiationOf<_U, std::optional>::value ||    // for @nullable types in the

                    IsInstantiationOf<_U, std::optional>::value ||    // for @nullable types in the

                                                                      // C++/NDK backends

                                                                      // C++/NDK backends

                    IsInstantiationOf<_U, std::unique_ptr>::value ||  // for @nullable(heap=true)

                                                                      // in C++/NDK backends

                    IsInstantiationOf<_U, std::shared_ptr>::value,    // for interface types in the

                    IsInstantiationOf<_U, std::shared_ptr>::value,    // for interface types in the

                                                                      // NDK backends

                                                                      // NDK backends
@@ -164,6 +166,11 @@ class ToEmptyString { 
    enum { value = decltype(_test<_T>(0))::value };

    enum { value = decltype(_test<_T>(0))::value };

};

};





template <typename _T>

struct TypeDependentFalse {

    enum { value = false };

};



}  // namespace details

}  // namespace details





template <typename _T>

template <typename _T>
@@ -223,7 +230,7 @@ std::string ToString(const _T& t) { 
        out << "]";

        out << "]";

        return out.str();

        return out.str();

    } else {

    } else {

        return "{no toString() implemented}";

        static_assert(details::TypeDependentFalse<_T>::value, "no toString implemented, huh?");

    }

    }

}

}