From bcb04e050ed7f84f52b0e305459df6d77a2990ac Mon Sep 17 00:00:00 2001 From: "John \"Juce\" Bruce" Date: Mon, 16 May 2022 18:37:09 -0700 Subject: [PATCH] Clean up constexprs with extra consts (This is a merge of http://go/wvgerrit/151930.) While grepping the code to respond to some CR feedback, I noticed a few places where we had sprinkled some unnecessary "const" specifiers amongst constexpr declarations. This patch cleans them up. There should be little semantic difference in the code after this patch, as it only removes specifiers that were redundant. The only exception is where "constexpr const char* X" was converted to "constexpr char X[]", which has slightly different semantics in edge cases we don't use. Test: x86-64 Bug: 231439638 Change-Id: I0b33777f8d3b718a3410f6d802c51b1220508d34 --- libwvdrmengine/cdm/core/src/crypto_session.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libwvdrmengine/cdm/core/src/crypto_session.cpp b/libwvdrmengine/cdm/core/src/crypto_session.cpp index 0a733c67..eb715315 100644 --- a/libwvdrmengine/cdm/core/src/crypto_session.cpp +++ b/libwvdrmengine/cdm/core/src/crypto_session.cpp @@ -70,7 +70,7 @@ constexpr size_t MiB = 1024 * 1024; constexpr uint32_t kRsaSignatureLength = 256; constexpr size_t kEstimatedInitialUsageTableHeader = 40; -const size_t kAes128BlockSize = 16; +constexpr size_t kAes128BlockSize = 16; constexpr int kMaxTerminateCountDown = 5;