From d737c3ed06f9aef6d68456288a5250c3893a8ca5 Mon Sep 17 00:00:00 2001 From: Cody Heiner Date: Thu, 15 Feb 2024 00:28:08 +0000 Subject: Fix implicit narrowing conversion in generated C++ code Also updates `auto` types to explicit types in order to improve readability and make it clear how and why different integral types are being used. Note: the only manual change here is the change to `generate_cpp.cpp`. The rest of the changes were produced by running: `system/tools/aidl/tests/golden_test.sh update` Test: build succeeds when generating code within a library that uses -Wall -Werror flags (where it failed before this change). Test: device runs normally. Change-Id: I704e3322318d2fe327320b50519de1acbefc33f9 --- generate_cpp.cpp | 6 ++--- .../aidl/fixedsizearray/FixedSizeArrayExample.cpp | 12 ++++----- .../gen/android/aidl/tests/ArrayOfInterfaces.cpp | 12 ++++----- .../gen/android/aidl/tests/CircularParcelable.cpp | 6 ++--- .../android/aidl/tests/DeprecatedParcelable.cpp | 6 ++--- .../gen/android/aidl/tests/FixedSize.cpp | 12 ++++----- .../gen/android/aidl/tests/ITestService.cpp | 24 ++++++++--------- .../gen/android/aidl/tests/ListOfInterfaces.cpp | 12 ++++----- .../aidl/tests/OtherParcelableForToString.cpp | 6 ++--- .../android/aidl/tests/ParcelableForToString.cpp | 6 ++--- .../gen/android/aidl/tests/RecursiveList.cpp | 6 ++--- .../android/aidl/tests/StructuredParcelable.cpp | 12 ++++----- .../aidl/tests/extension/ExtendableParcelable.cpp | 6 ++--- .../gen/android/aidl/tests/extension/MyExt.cpp | 6 ++--- .../gen/android/aidl/tests/extension/MyExt2.cpp | 6 ++--- .../gen/android/aidl/tests/extension/MyExtLike.cpp | 6 ++--- .../gen/android/aidl/tests/nested/DeeplyNested.cpp | 30 +++++++++++----------- .../android/aidl/tests/nested/INestedService.cpp | 6 ++--- .../aidl/tests/nested/ParcelableWithNested.cpp | 6 ++--- .../aidl/tests/GenericStructuredParcelable.h | 6 ++--- .../gen/android/aidl/versioned/tests/Foo.cpp | 6 ++--- .../gen/android/aidl/versioned/tests/Foo.cpp | 6 ++--- .../gen/android/aidl/versioned/tests/Foo.cpp | 6 ++--- .../gen/android/aidl/loggable/Data.cpp | 6 ++--- .../aidl/fixedsizearray/FixedSizeArrayExample.cpp | 12 ++++----- .../gen/android/aidl/tests/ArrayOfInterfaces.cpp | 12 ++++----- .../gen/android/aidl/tests/CircularParcelable.cpp | 6 ++--- .../android/aidl/tests/DeprecatedParcelable.cpp | 6 ++--- .../gen/android/aidl/tests/FixedSize.cpp | 12 ++++----- .../gen/android/aidl/tests/ITestService.cpp | 24 ++++++++--------- .../gen/android/aidl/tests/ListOfInterfaces.cpp | 12 ++++----- .../aidl/tests/OtherParcelableForToString.cpp | 6 ++--- .../android/aidl/tests/ParcelableForToString.cpp | 6 ++--- .../gen/android/aidl/tests/RecursiveList.cpp | 6 ++--- .../android/aidl/tests/StructuredParcelable.cpp | 12 ++++----- .../aidl/tests/extension/ExtendableParcelable.cpp | 6 ++--- .../gen/android/aidl/tests/extension/MyExt.cpp | 6 ++--- .../gen/android/aidl/tests/extension/MyExt2.cpp | 6 ++--- .../gen/android/aidl/tests/extension/MyExtLike.cpp | 6 ++--- .../gen/android/aidl/tests/nested/DeeplyNested.cpp | 30 +++++++++++----------- .../android/aidl/tests/nested/INestedService.cpp | 6 ++--- .../aidl/tests/nested/ParcelableWithNested.cpp | 6 ++--- .../aidl/tests/GenericStructuredParcelable.h | 6 ++--- .../gen/android/aidl/versioned/tests/Foo.cpp | 6 ++--- .../gen/android/aidl/versioned/tests/Foo.cpp | 6 ++--- .../gen/android/aidl/versioned/tests/Foo.cpp | 6 ++--- .../gen/android/aidl/loggable/Data.cpp | 6 ++--- .../android/aidl/test/trunk/ITrunkStableTest.cpp | 6 ++--- .../android/aidl/test/trunk/ITrunkStableTest.cpp | 12 ++++----- .../android/aidl/test/trunk/ITrunkStableTest.cpp | 6 ++--- .../android/aidl/test/trunk/ITrunkStableTest.cpp | 12 ++++----- 51 files changed, 231 insertions(+), 231 deletions(-) diff --git a/generate_cpp.cpp b/generate_cpp.cpp index 82907b5c..f8aed492 100644 --- a/generate_cpp.cpp +++ b/generate_cpp.cpp @@ -1153,7 +1153,7 @@ void GenerateReadFromParcel(CodeWriter& out, const AidlStructuredParcelable& par void GenerateWriteToParcel(CodeWriter& out, const AidlStructuredParcelable& parcel, const AidlTypenames& typenames) { out << "::android::status_t _aidl_ret_status = ::android::OK;\n"; - out << "auto _aidl_start_pos = " << kParcelVarName << "->dataPosition();\n"; + out << "size_t _aidl_start_pos = " << kParcelVarName << "->dataPosition();\n"; out << kParcelVarName << "->writeInt32(0);\n"; for (const auto& variable : parcel.GetFields()) { string method = ParcelWriteMethodOf(variable->GetType(), typenames); @@ -1171,9 +1171,9 @@ void GenerateWriteToParcel(CodeWriter& out, const AidlStructuredParcelable& parc out << "}\n"; } } - out << "auto _aidl_end_pos = " << kParcelVarName << "->dataPosition();\n"; + out << "size_t _aidl_end_pos = " << kParcelVarName << "->dataPosition();\n"; out << kParcelVarName << "->setDataPosition(_aidl_start_pos);\n"; - out << kParcelVarName << "->writeInt32(_aidl_end_pos - _aidl_start_pos);\n"; + out << kParcelVarName << "->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos));\n"; out << kParcelVarName << "->setDataPosition(_aidl_end_pos);\n"; out << "return _aidl_ret_status;\n"; } diff --git a/tests/golden_output/aidl-test-fixedsizearray-cpp-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.cpp b/tests/golden_output/aidl-test-fixedsizearray-cpp-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.cpp index e048f51b..ffb67d05 100644 --- a/tests/golden_output/aidl-test-fixedsizearray-cpp-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.cpp +++ b/tests/golden_output/aidl-test-fixedsizearray-cpp-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.cpp @@ -463,7 +463,7 @@ namespace fixedsizearray { } ::android::status_t FixedSizeArrayExample::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeFixedArray(int2x3); if (((_aidl_ret_status) != (::android::OK))) { @@ -685,9 +685,9 @@ namespace fixedsizearray { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -1402,15 +1402,15 @@ namespace fixedsizearray { } ::android::status_t FixedSizeArrayExample::IntParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(value); if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ArrayOfInterfaces.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ArrayOfInterfaces.cpp index 546ce925..5ddb0503 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ArrayOfInterfaces.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ArrayOfInterfaces.cpp @@ -23,11 +23,11 @@ namespace tests { } ::android::status_t ArrayOfInterfaces::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -361,7 +361,7 @@ namespace tests { } ::android::status_t ArrayOfInterfaces::MyParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeStrongBinder(iface); if (((_aidl_ret_status) != (::android::OK))) { @@ -379,9 +379,9 @@ namespace tests { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/CircularParcelable.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/CircularParcelable.cpp index 0b9483f2..9813a088 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/CircularParcelable.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/CircularParcelable.cpp @@ -31,15 +31,15 @@ namespace tests { } ::android::status_t CircularParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeStrongBinder(testService); if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/DeprecatedParcelable.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/DeprecatedParcelable.cpp index 0d9362b6..cd1bdf49 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/DeprecatedParcelable.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/DeprecatedParcelable.cpp @@ -23,11 +23,11 @@ namespace tests { } ::android::status_t DeprecatedParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/FixedSize.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/FixedSize.cpp index 40daab7d..b1a16ba9 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/FixedSize.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/FixedSize.cpp @@ -23,11 +23,11 @@ namespace tests { } ::android::status_t FixedSize::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -127,7 +127,7 @@ namespace tests { } ::android::status_t FixedSize::FixedParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeBool(booleanValue); if (((_aidl_ret_status) != (::android::OK))) { @@ -165,9 +165,9 @@ namespace tests { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ITestService.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ITestService.cpp index d0fb7ed4..023112c8 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ITestService.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ITestService.cpp @@ -5200,11 +5200,11 @@ namespace tests { } ::android::status_t ITestService::Empty::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -5376,7 +5376,7 @@ namespace tests { } ::android::status_t ITestService::CompilerChecks::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeStrongBinder(binder); if (((_aidl_ret_status) != (::android::OK))) { @@ -5450,9 +5450,9 @@ namespace tests { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -5545,15 +5545,15 @@ namespace tests { } ::android::status_t ITestService::CompilerChecks::HasDeprecated::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(deprecated); if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -5729,11 +5729,11 @@ namespace tests { } ::android::status_t ITestService::CompilerChecks::INoPrefixInterface::Nested::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ListOfInterfaces.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ListOfInterfaces.cpp index 81060a5f..b87daec1 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ListOfInterfaces.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ListOfInterfaces.cpp @@ -23,11 +23,11 @@ namespace tests { } ::android::status_t ListOfInterfaces::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -345,7 +345,7 @@ namespace tests { } ::android::status_t ListOfInterfaces::MyParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeStrongBinder(iface); if (((_aidl_ret_status) != (::android::OK))) { @@ -363,9 +363,9 @@ namespace tests { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/OtherParcelableForToString.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/OtherParcelableForToString.cpp index 1efd1eb0..9a6066e6 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/OtherParcelableForToString.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/OtherParcelableForToString.cpp @@ -31,15 +31,15 @@ namespace tests { } ::android::status_t OtherParcelableForToString::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeString16(field); if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ParcelableForToString.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ParcelableForToString.cpp index a0eacdaa..72cee04b 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ParcelableForToString.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ParcelableForToString.cpp @@ -207,7 +207,7 @@ namespace tests { } ::android::status_t ParcelableForToString::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(intValue); if (((_aidl_ret_status) != (::android::OK))) { @@ -301,9 +301,9 @@ namespace tests { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/RecursiveList.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/RecursiveList.cpp index 0284cb98..eb0796ed 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/RecursiveList.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/RecursiveList.cpp @@ -39,7 +39,7 @@ namespace tests { } ::android::status_t RecursiveList::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(value); if (((_aidl_ret_status) != (::android::OK))) { @@ -49,9 +49,9 @@ namespace tests { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/StructuredParcelable.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/StructuredParcelable.cpp index 67e3a697..5e51c7ec 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/StructuredParcelable.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/StructuredParcelable.cpp @@ -463,7 +463,7 @@ namespace tests { } ::android::status_t StructuredParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32Vector(shouldContainThreeFs); if (((_aidl_ret_status) != (::android::OK))) { @@ -685,9 +685,9 @@ namespace tests { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -715,11 +715,11 @@ namespace tests { } ::android::status_t StructuredParcelable::Empty::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/ExtendableParcelable.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/ExtendableParcelable.cpp index 11ab2861..4c16bb64 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/ExtendableParcelable.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/ExtendableParcelable.cpp @@ -64,7 +64,7 @@ namespace extension { } ::android::status_t ExtendableParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(a); if (((_aidl_ret_status) != (::android::OK))) { @@ -86,9 +86,9 @@ namespace extension { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExt.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExt.cpp index c1c50219..e477baaa 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExt.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExt.cpp @@ -40,7 +40,7 @@ namespace extension { } ::android::status_t MyExt::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(a); if (((_aidl_ret_status) != (::android::OK))) { @@ -50,9 +50,9 @@ namespace extension { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExt2.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExt2.cpp index c08ecb1d..d1392785 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExt2.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExt2.cpp @@ -48,7 +48,7 @@ namespace extension { } ::android::status_t MyExt2::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(a); if (((_aidl_ret_status) != (::android::OK))) { @@ -62,9 +62,9 @@ namespace extension { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExtLike.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExtLike.cpp index 9d3ba35f..76fac847 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExtLike.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExtLike.cpp @@ -40,7 +40,7 @@ namespace extension { } ::android::status_t MyExtLike::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(a); if (((_aidl_ret_status) != (::android::OK))) { @@ -50,9 +50,9 @@ namespace extension { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/DeeplyNested.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/DeeplyNested.cpp index 2b68d264..dff3333f 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/DeeplyNested.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/DeeplyNested.cpp @@ -24,11 +24,11 @@ namespace nested { } ::android::status_t DeeplyNested::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -66,15 +66,15 @@ namespace nested { } ::android::status_t DeeplyNested::A::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeByte(static_cast(e)); if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -104,11 +104,11 @@ namespace nested { } ::android::status_t DeeplyNested::B::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -138,11 +138,11 @@ namespace nested { } ::android::status_t DeeplyNested::B::C::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -172,11 +172,11 @@ namespace nested { } ::android::status_t DeeplyNested::B::C::D::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/INestedService.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/INestedService.cpp index e5a91895..e261f9f9 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/INestedService.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/INestedService.cpp @@ -231,15 +231,15 @@ namespace nested { } ::android::status_t INestedService::Result::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeByte(static_cast(status)); if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/ParcelableWithNested.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/ParcelableWithNested.cpp index 6c426e71..9836b7a9 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/ParcelableWithNested.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/ParcelableWithNested.cpp @@ -32,15 +32,15 @@ namespace nested { } ::android::status_t ParcelableWithNested::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeByte(static_cast(status)); if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/GenericStructuredParcelable.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/GenericStructuredParcelable.h index f55e1aad..190c6314 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/GenericStructuredParcelable.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/GenericStructuredParcelable.h @@ -95,7 +95,7 @@ template template ::android::status_t GenericStructuredParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(a); if (((_aidl_ret_status) != (::android::OK))) { @@ -105,9 +105,9 @@ template if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-versioned-interface-V1-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp b/tests/golden_output/aidl-test-versioned-interface-V1-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp index 16a42bd7..b9b62a52 100644 --- a/tests/golden_output/aidl-test-versioned-interface-V1-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp +++ b/tests/golden_output/aidl-test-versioned-interface-V1-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp @@ -24,11 +24,11 @@ namespace tests { } ::android::status_t Foo::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-versioned-interface-V2-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp b/tests/golden_output/aidl-test-versioned-interface-V2-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp index 92018e90..19c8d1c9 100644 --- a/tests/golden_output/aidl-test-versioned-interface-V2-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp +++ b/tests/golden_output/aidl-test-versioned-interface-V2-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp @@ -32,15 +32,15 @@ namespace tests { } ::android::status_t Foo::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(intDefault42); if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl-test-versioned-interface-V3-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp b/tests/golden_output/aidl-test-versioned-interface-V3-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp index 2b99d056..33bbfa65 100644 --- a/tests/golden_output/aidl-test-versioned-interface-V3-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp +++ b/tests/golden_output/aidl-test-versioned-interface-V3-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp @@ -32,15 +32,15 @@ namespace tests { } ::android::status_t Foo::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(intDefault42); if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/android/aidl/loggable/Data.cpp b/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/android/aidl/loggable/Data.cpp index ced40292..e74f8382 100644 --- a/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/android/aidl/loggable/Data.cpp +++ b/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/android/aidl/loggable/Data.cpp @@ -55,7 +55,7 @@ namespace loggable { } ::android::status_t Data::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(num); if (((_aidl_ret_status) != (::android::OK))) { @@ -73,9 +73,9 @@ namespace loggable { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-fixedsizearray-cpp-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.cpp b/tests/golden_output/frozen/aidl-test-fixedsizearray-cpp-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.cpp index e048f51b..ffb67d05 100644 --- a/tests/golden_output/frozen/aidl-test-fixedsizearray-cpp-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.cpp +++ b/tests/golden_output/frozen/aidl-test-fixedsizearray-cpp-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.cpp @@ -463,7 +463,7 @@ namespace fixedsizearray { } ::android::status_t FixedSizeArrayExample::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeFixedArray(int2x3); if (((_aidl_ret_status) != (::android::OK))) { @@ -685,9 +685,9 @@ namespace fixedsizearray { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -1402,15 +1402,15 @@ namespace fixedsizearray { } ::android::status_t FixedSizeArrayExample::IntParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(value); if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/ArrayOfInterfaces.cpp b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/ArrayOfInterfaces.cpp index 546ce925..5ddb0503 100644 --- a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/ArrayOfInterfaces.cpp +++ b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/ArrayOfInterfaces.cpp @@ -23,11 +23,11 @@ namespace tests { } ::android::status_t ArrayOfInterfaces::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -361,7 +361,7 @@ namespace tests { } ::android::status_t ArrayOfInterfaces::MyParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeStrongBinder(iface); if (((_aidl_ret_status) != (::android::OK))) { @@ -379,9 +379,9 @@ namespace tests { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/CircularParcelable.cpp b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/CircularParcelable.cpp index 0b9483f2..9813a088 100644 --- a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/CircularParcelable.cpp +++ b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/CircularParcelable.cpp @@ -31,15 +31,15 @@ namespace tests { } ::android::status_t CircularParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeStrongBinder(testService); if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/DeprecatedParcelable.cpp b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/DeprecatedParcelable.cpp index 0d9362b6..cd1bdf49 100644 --- a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/DeprecatedParcelable.cpp +++ b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/DeprecatedParcelable.cpp @@ -23,11 +23,11 @@ namespace tests { } ::android::status_t DeprecatedParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/FixedSize.cpp b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/FixedSize.cpp index 40daab7d..b1a16ba9 100644 --- a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/FixedSize.cpp +++ b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/FixedSize.cpp @@ -23,11 +23,11 @@ namespace tests { } ::android::status_t FixedSize::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -127,7 +127,7 @@ namespace tests { } ::android::status_t FixedSize::FixedParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeBool(booleanValue); if (((_aidl_ret_status) != (::android::OK))) { @@ -165,9 +165,9 @@ namespace tests { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/ITestService.cpp b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/ITestService.cpp index d0fb7ed4..023112c8 100644 --- a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/ITestService.cpp +++ b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/ITestService.cpp @@ -5200,11 +5200,11 @@ namespace tests { } ::android::status_t ITestService::Empty::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -5376,7 +5376,7 @@ namespace tests { } ::android::status_t ITestService::CompilerChecks::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeStrongBinder(binder); if (((_aidl_ret_status) != (::android::OK))) { @@ -5450,9 +5450,9 @@ namespace tests { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -5545,15 +5545,15 @@ namespace tests { } ::android::status_t ITestService::CompilerChecks::HasDeprecated::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(deprecated); if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -5729,11 +5729,11 @@ namespace tests { } ::android::status_t ITestService::CompilerChecks::INoPrefixInterface::Nested::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/ListOfInterfaces.cpp b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/ListOfInterfaces.cpp index 81060a5f..b87daec1 100644 --- a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/ListOfInterfaces.cpp +++ b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/ListOfInterfaces.cpp @@ -23,11 +23,11 @@ namespace tests { } ::android::status_t ListOfInterfaces::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -345,7 +345,7 @@ namespace tests { } ::android::status_t ListOfInterfaces::MyParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeStrongBinder(iface); if (((_aidl_ret_status) != (::android::OK))) { @@ -363,9 +363,9 @@ namespace tests { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/OtherParcelableForToString.cpp b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/OtherParcelableForToString.cpp index 1efd1eb0..9a6066e6 100644 --- a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/OtherParcelableForToString.cpp +++ b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/OtherParcelableForToString.cpp @@ -31,15 +31,15 @@ namespace tests { } ::android::status_t OtherParcelableForToString::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeString16(field); if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/ParcelableForToString.cpp b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/ParcelableForToString.cpp index a0eacdaa..72cee04b 100644 --- a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/ParcelableForToString.cpp +++ b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/ParcelableForToString.cpp @@ -207,7 +207,7 @@ namespace tests { } ::android::status_t ParcelableForToString::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(intValue); if (((_aidl_ret_status) != (::android::OK))) { @@ -301,9 +301,9 @@ namespace tests { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/RecursiveList.cpp b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/RecursiveList.cpp index 0284cb98..eb0796ed 100644 --- a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/RecursiveList.cpp +++ b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/RecursiveList.cpp @@ -39,7 +39,7 @@ namespace tests { } ::android::status_t RecursiveList::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(value); if (((_aidl_ret_status) != (::android::OK))) { @@ -49,9 +49,9 @@ namespace tests { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/StructuredParcelable.cpp b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/StructuredParcelable.cpp index 67e3a697..5e51c7ec 100644 --- a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/StructuredParcelable.cpp +++ b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/StructuredParcelable.cpp @@ -463,7 +463,7 @@ namespace tests { } ::android::status_t StructuredParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32Vector(shouldContainThreeFs); if (((_aidl_ret_status) != (::android::OK))) { @@ -685,9 +685,9 @@ namespace tests { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -715,11 +715,11 @@ namespace tests { } ::android::status_t StructuredParcelable::Empty::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/ExtendableParcelable.cpp b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/ExtendableParcelable.cpp index 11ab2861..4c16bb64 100644 --- a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/ExtendableParcelable.cpp +++ b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/ExtendableParcelable.cpp @@ -64,7 +64,7 @@ namespace extension { } ::android::status_t ExtendableParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(a); if (((_aidl_ret_status) != (::android::OK))) { @@ -86,9 +86,9 @@ namespace extension { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExt.cpp b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExt.cpp index c1c50219..e477baaa 100644 --- a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExt.cpp +++ b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExt.cpp @@ -40,7 +40,7 @@ namespace extension { } ::android::status_t MyExt::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(a); if (((_aidl_ret_status) != (::android::OK))) { @@ -50,9 +50,9 @@ namespace extension { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExt2.cpp b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExt2.cpp index c08ecb1d..d1392785 100644 --- a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExt2.cpp +++ b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExt2.cpp @@ -48,7 +48,7 @@ namespace extension { } ::android::status_t MyExt2::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(a); if (((_aidl_ret_status) != (::android::OK))) { @@ -62,9 +62,9 @@ namespace extension { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExtLike.cpp b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExtLike.cpp index 9d3ba35f..76fac847 100644 --- a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExtLike.cpp +++ b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/extension/MyExtLike.cpp @@ -40,7 +40,7 @@ namespace extension { } ::android::status_t MyExtLike::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(a); if (((_aidl_ret_status) != (::android::OK))) { @@ -50,9 +50,9 @@ namespace extension { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/DeeplyNested.cpp b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/DeeplyNested.cpp index 2b68d264..dff3333f 100644 --- a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/DeeplyNested.cpp +++ b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/DeeplyNested.cpp @@ -24,11 +24,11 @@ namespace nested { } ::android::status_t DeeplyNested::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -66,15 +66,15 @@ namespace nested { } ::android::status_t DeeplyNested::A::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeByte(static_cast(e)); if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -104,11 +104,11 @@ namespace nested { } ::android::status_t DeeplyNested::B::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -138,11 +138,11 @@ namespace nested { } ::android::status_t DeeplyNested::B::C::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -172,11 +172,11 @@ namespace nested { } ::android::status_t DeeplyNested::B::C::D::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/INestedService.cpp b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/INestedService.cpp index e5a91895..e261f9f9 100644 --- a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/INestedService.cpp +++ b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/INestedService.cpp @@ -231,15 +231,15 @@ namespace nested { } ::android::status_t INestedService::Result::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeByte(static_cast(status)); if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/ParcelableWithNested.cpp b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/ParcelableWithNested.cpp index 6c426e71..9836b7a9 100644 --- a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/ParcelableWithNested.cpp +++ b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/ParcelableWithNested.cpp @@ -32,15 +32,15 @@ namespace nested { } ::android::status_t ParcelableWithNested::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeByte(static_cast(status)); if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/GenericStructuredParcelable.h b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/GenericStructuredParcelable.h index f55e1aad..190c6314 100644 --- a/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/GenericStructuredParcelable.h +++ b/tests/golden_output/frozen/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/GenericStructuredParcelable.h @@ -95,7 +95,7 @@ template template ::android::status_t GenericStructuredParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(a); if (((_aidl_ret_status) != (::android::OK))) { @@ -105,9 +105,9 @@ template if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-versioned-interface-V1-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp b/tests/golden_output/frozen/aidl-test-versioned-interface-V1-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp index 16a42bd7..b9b62a52 100644 --- a/tests/golden_output/frozen/aidl-test-versioned-interface-V1-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp +++ b/tests/golden_output/frozen/aidl-test-versioned-interface-V1-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp @@ -24,11 +24,11 @@ namespace tests { } ::android::status_t Foo::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-versioned-interface-V2-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp b/tests/golden_output/frozen/aidl-test-versioned-interface-V2-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp index 92018e90..19c8d1c9 100644 --- a/tests/golden_output/frozen/aidl-test-versioned-interface-V2-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp +++ b/tests/golden_output/frozen/aidl-test-versioned-interface-V2-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp @@ -32,15 +32,15 @@ namespace tests { } ::android::status_t Foo::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(intDefault42); if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl-test-versioned-interface-V3-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp b/tests/golden_output/frozen/aidl-test-versioned-interface-V3-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp index 2b99d056..33bbfa65 100644 --- a/tests/golden_output/frozen/aidl-test-versioned-interface-V3-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp +++ b/tests/golden_output/frozen/aidl-test-versioned-interface-V3-cpp-source/gen/android/aidl/versioned/tests/Foo.cpp @@ -32,15 +32,15 @@ namespace tests { } ::android::status_t Foo::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(intDefault42); if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/aidl_test_loggable_interface-cpp-source/gen/android/aidl/loggable/Data.cpp b/tests/golden_output/frozen/aidl_test_loggable_interface-cpp-source/gen/android/aidl/loggable/Data.cpp index ced40292..e74f8382 100644 --- a/tests/golden_output/frozen/aidl_test_loggable_interface-cpp-source/gen/android/aidl/loggable/Data.cpp +++ b/tests/golden_output/frozen/aidl_test_loggable_interface-cpp-source/gen/android/aidl/loggable/Data.cpp @@ -55,7 +55,7 @@ namespace loggable { } ::android::status_t Data::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(num); if (((_aidl_ret_status) != (::android::OK))) { @@ -73,9 +73,9 @@ namespace loggable { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/tests/trunk_stable_test/android.aidl.test.trunk-V1-cpp-source/gen/android/aidl/test/trunk/ITrunkStableTest.cpp b/tests/golden_output/frozen/tests/trunk_stable_test/android.aidl.test.trunk-V1-cpp-source/gen/android/aidl/test/trunk/ITrunkStableTest.cpp index 7d21e119..cb6f59b8 100644 --- a/tests/golden_output/frozen/tests/trunk_stable_test/android.aidl.test.trunk-V1-cpp-source/gen/android/aidl/test/trunk/ITrunkStableTest.cpp +++ b/tests/golden_output/frozen/tests/trunk_stable_test/android.aidl.test.trunk-V1-cpp-source/gen/android/aidl/test/trunk/ITrunkStableTest.cpp @@ -581,7 +581,7 @@ namespace trunk { } ::android::status_t ITrunkStableTest::MyParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(a); if (((_aidl_ret_status) != (::android::OK))) { @@ -591,9 +591,9 @@ namespace trunk { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/frozen/tests/trunk_stable_test/android.aidl.test.trunk-V2-cpp-source/gen/android/aidl/test/trunk/ITrunkStableTest.cpp b/tests/golden_output/frozen/tests/trunk_stable_test/android.aidl.test.trunk-V2-cpp-source/gen/android/aidl/test/trunk/ITrunkStableTest.cpp index 6b022afc..4c1daa05 100644 --- a/tests/golden_output/frozen/tests/trunk_stable_test/android.aidl.test.trunk-V2-cpp-source/gen/android/aidl/test/trunk/ITrunkStableTest.cpp +++ b/tests/golden_output/frozen/tests/trunk_stable_test/android.aidl.test.trunk-V2-cpp-source/gen/android/aidl/test/trunk/ITrunkStableTest.cpp @@ -706,7 +706,7 @@ namespace trunk { } ::android::status_t ITrunkStableTest::MyParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(a); if (((_aidl_ret_status) != (::android::OK))) { @@ -722,9 +722,9 @@ namespace trunk { return _aidl_ret_status; } } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -1389,7 +1389,7 @@ namespace trunk { } ::android::status_t ITrunkStableTest::MyOtherParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(a); if (((_aidl_ret_status) != (::android::OK))) { @@ -1399,9 +1399,9 @@ namespace trunk { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/tests/trunk_stable_test/android.aidl.test.trunk-V1-cpp-source/gen/android/aidl/test/trunk/ITrunkStableTest.cpp b/tests/golden_output/tests/trunk_stable_test/android.aidl.test.trunk-V1-cpp-source/gen/android/aidl/test/trunk/ITrunkStableTest.cpp index 7d21e119..cb6f59b8 100644 --- a/tests/golden_output/tests/trunk_stable_test/android.aidl.test.trunk-V1-cpp-source/gen/android/aidl/test/trunk/ITrunkStableTest.cpp +++ b/tests/golden_output/tests/trunk_stable_test/android.aidl.test.trunk-V1-cpp-source/gen/android/aidl/test/trunk/ITrunkStableTest.cpp @@ -581,7 +581,7 @@ namespace trunk { } ::android::status_t ITrunkStableTest::MyParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(a); if (((_aidl_ret_status) != (::android::OK))) { @@ -591,9 +591,9 @@ namespace trunk { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } diff --git a/tests/golden_output/tests/trunk_stable_test/android.aidl.test.trunk-V2-cpp-source/gen/android/aidl/test/trunk/ITrunkStableTest.cpp b/tests/golden_output/tests/trunk_stable_test/android.aidl.test.trunk-V2-cpp-source/gen/android/aidl/test/trunk/ITrunkStableTest.cpp index b5e35c91..69088c21 100644 --- a/tests/golden_output/tests/trunk_stable_test/android.aidl.test.trunk-V2-cpp-source/gen/android/aidl/test/trunk/ITrunkStableTest.cpp +++ b/tests/golden_output/tests/trunk_stable_test/android.aidl.test.trunk-V2-cpp-source/gen/android/aidl/test/trunk/ITrunkStableTest.cpp @@ -696,7 +696,7 @@ namespace trunk { } ::android::status_t ITrunkStableTest::MyParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(a); if (((_aidl_ret_status) != (::android::OK))) { @@ -710,9 +710,9 @@ namespace trunk { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } @@ -1368,7 +1368,7 @@ namespace trunk { } ::android::status_t ITrunkStableTest::MyOtherParcelable::writeToParcel(::android::Parcel* _aidl_parcel) const { ::android::status_t _aidl_ret_status = ::android::OK; - auto _aidl_start_pos = _aidl_parcel->dataPosition(); + size_t _aidl_start_pos = _aidl_parcel->dataPosition(); _aidl_parcel->writeInt32(0); _aidl_ret_status = _aidl_parcel->writeInt32(a); if (((_aidl_ret_status) != (::android::OK))) { @@ -1378,9 +1378,9 @@ namespace trunk { if (((_aidl_ret_status) != (::android::OK))) { return _aidl_ret_status; } - auto _aidl_end_pos = _aidl_parcel->dataPosition(); + size_t _aidl_end_pos = _aidl_parcel->dataPosition(); _aidl_parcel->setDataPosition(_aidl_start_pos); - _aidl_parcel->writeInt32(_aidl_end_pos - _aidl_start_pos); + _aidl_parcel->writeInt32(static_cast(_aidl_end_pos - _aidl_start_pos)); _aidl_parcel->setDataPosition(_aidl_end_pos); return _aidl_ret_status; } -- cgit v1.2.3