Skip to content

Commit 94e88cf

Browse files
committed
libteeui: avoid vector<const T>
A container of const T uses std::allocator<const T>, which was an undocumented libc++ extension that has been removed. See llvm/llvm-project#96319. Bug: 349681543 Test: m android.hardware.confirmationui-lib.cuttlefish Test: trusty/vendor/google/aosp/scripts/build.py qemu-generic-arm64-test-debug Change-Id: I455844e2b09cfee34646bc3693867c7c1ff597e3
1 parent ccb9d03 commit 94e88cf

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

libteeui/include/teeui/common_message_types.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ enum class TestModeCommands : uint64_t {
6767
CANCEL_EVENT = 1ull,
6868
};
6969

70-
using MsgString = static_vec<const char>;
70+
using MsgString = static_vec<char>;
7171
template <typename T> using MsgVector = static_vec<T>;
7272

7373
template <typename T> inline const uint8_t* copyField(T& field, const uint8_t*(&pos)) {
@@ -133,7 +133,7 @@ inline WriteStream write(WriteStream out, const MsgVector<uint8_t>& v) {
133133

134134
// MsgString
135135
inline std::tuple<ReadStream, MsgString> read(Message<MsgString>, ReadStream in) {
136-
return readSimpleVecInPlace<const char>(in);
136+
return readSimpleVecInPlace<char>(in);
137137
}
138138
inline WriteStream write(WriteStream out, const MsgString& v) {
139139
return writeSimpleVec(out, v);

libteeui/include/teeui/generic_operation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ template <typename Derived, typename TimeStamp> class Operation {
166166

167167
bool isPending() const { return error_ != ResponseCode::Ignored; }
168168

169-
const MsgString getPrompt() const {
169+
MsgString getPrompt() {
170170
return {&promptStringBuffer_[0], &promptStringBuffer_[strlen(promptStringBuffer_)]};
171171
}
172172

0 commit comments

Comments
 (0)