Merge "PDL: Remove deprecated is_pod" into main (4cb692cb) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/packet/endian_inserter.h

+14 −14

Original line number	Diff line number	Diff line
		@@ -38,15 +38,15 @@ class EndianInserter {
		virtual ~EndianInserter() = default;

		protected:
		// Write sizeof(FixedWidthPODType) bytes using the iterator
		template <typename FixedWidthPODType, typename std::enable_if<std::is_pod<FixedWidthPODType>::value, int>::type = 0>
		void insert(FixedWidthPODType value, BitInserter& it) const {
		// Write sizeof(T) bytes using the iterator
		template <typename T, typename std::enable_if<std::is_trivial<T>::value, int>::type = 0>
		void insert(T value, BitInserter& it) const {
		uint8_t* raw_bytes = (uint8_t*)&value;
		for (size_t i = 0; i < sizeof(FixedWidthPODType); i++) {
		for (size_t i = 0; i < sizeof(T); i++) {
		if (little_endian == true) {
		it.insert_byte(raw_bytes[i]);
		} else {
		it.insert_byte(raw_bytes[sizeof(FixedWidthPODType) - i - 1]);
		it.insert_byte(raw_bytes[sizeof(T) - i - 1]);
		}
		}
		}
		@@ -67,10 +67,9 @@ class EndianInserter {
		}

		// Write num_bits bits using the iterator
		template <typename FixedWidthIntegerType,
		typename std::enable_if<std::is_pod<FixedWidthIntegerType>::value, int>::type = 0>
		void insert(FixedWidthIntegerType value, BitInserter& it, size_t num_bits) const {
		ASSERT(num_bits <= (sizeof(FixedWidthIntegerType) * 8));
		template <typename T, typename std::enable_if<std::is_trivial<T>::value, int>::type = 0>
		void insert(T value, BitInserter& it, size_t num_bits) const {
		ASSERT(num_bits <= (sizeof(T) * 8));

		for (size_t i = 0; i < num_bits / 8; i++) {
		if (little_endian == true) {
		@@ -92,10 +91,11 @@ class EndianInserter {
		insert<enum_type>(static_cast<enum_type>(value), it);
		}

		// Write a vector of FixedWidthIntegerType using the iterator
		template <typename FixedWidthIntegerType>
		void insert_vector(const std::vector<FixedWidthIntegerType>& vec, BitInserter& it) const {
		static_assert(std::is_pod<FixedWidthIntegerType>::value,
		// Write a vector of T using the iterator
		template <typename T, typename std::enable_if<std::is_trivial<T>::value, int>::type = 0>
		void insert_vector(const std::vector<T>& vec, BitInserter& it) const {
		static_assert(
		std::is_trivial<T>::value,
		"EndianInserter::insert requires a vector with elements of a fixed-size.");
		for (const auto& element : vec) {
		insert(element, it);

system/gd/packet/iterator.h

+7 −7

Original line number	Diff line number	Diff line
		@@ -76,15 +76,15 @@ class Iterator : public IteratorTraits {

		Iterator Subrange(size_t index, size_t length) const;

		// Get the next sizeof(FixedWidthPODType) bytes and return the filled type
		template <typename FixedWidthPODType, typename std::enable_if<std::is_pod<FixedWidthPODType>::value, int>::type = 0>
		FixedWidthPODType extract() {
		static_assert(std::is_pod<FixedWidthPODType>::value, "Iterator::extract requires a fixed-width type.");
		FixedWidthPODType extracted_value{};
		// Get the next sizeof(T) bytes and return the filled type
		template <typename T, typename std::enable_if<std::is_trivial<T>::value, int>::type = 0>
		T extract() {
		static_assert(std::is_trivial<T>::value, "Iterator::extract requires a fixed-width type.");
		T extracted_value{};
		uint8_t* value_ptr = (uint8_t*)&extracted_value;

		for (size_t i = 0; i < sizeof(FixedWidthPODType); i++) {
		size_t index = (little_endian ? i : sizeof(FixedWidthPODType) - i - 1);
		for (size_t i = 0; i < sizeof(T); i++) {
		size_t index = (little_endian ? i : sizeof(T) - i - 1);
		value_ptr[index] = this->operator*();
		this->operator++();
		}