| commit | 6df5fa458923111f34d0093960fc2bd1df5bcadc | [log] [tgz] |
|---|---|---|
| author | Aaron Okano <aaronokano@google.com> | Mon Jan 06 08:45:46 2025 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jan 06 08:45:46 2025 -0800 |
| tree | cf50c0e426fb7db7b3d300c46ece2b47e22415e8 | |
| parent | cdbd77a8385cc77aac7fa067fea7ff78f84d2270 [diff] | |
| parent | 3354ccd23fc3757d2049a19357ed9346d64ef563 [diff] |
Merge "Change static const to static constexpr" into main
diff --git a/automotive/vehicle/aidl/impl/3/utils/common/test/PendingRequestPoolTest.cpp b/automotive/vehicle/aidl/impl/3/utils/common/test/PendingRequestPoolTest.cpp index 734c739..cc690d7 100644 --- a/automotive/vehicle/aidl/impl/3/utils/common/test/PendingRequestPoolTest.cpp +++ b/automotive/vehicle/aidl/impl/3/utils/common/test/PendingRequestPoolTest.cpp
@@ -57,7 +57,7 @@ private: // Test timeout is 0.1s. - static const int64_t TEST_TIMEOUT = 100000000; + static constexpr int64_t TEST_TIMEOUT = 100000000; std::unique_ptr<PendingRequestPool> mPool; };
diff --git a/automotive/vehicle/aidl/impl/current/utils/common/test/PendingRequestPoolTest.cpp b/automotive/vehicle/aidl/impl/current/utils/common/test/PendingRequestPoolTest.cpp index 734c739..cc690d7 100644 --- a/automotive/vehicle/aidl/impl/current/utils/common/test/PendingRequestPoolTest.cpp +++ b/automotive/vehicle/aidl/impl/current/utils/common/test/PendingRequestPoolTest.cpp
@@ -57,7 +57,7 @@ private: // Test timeout is 0.1s. - static const int64_t TEST_TIMEOUT = 100000000; + static constexpr int64_t TEST_TIMEOUT = 100000000; std::unique_ptr<PendingRequestPool> mPool; };