Skip to content

Commit 46db63d

Browse files
sbisciglsbiscigl
authored
Add toolchain for cpp 20 (#2011)
1 parent d55bd18 commit 46db63d

File tree

7 files changed

+29
-21
lines changed

7 files changed

+29
-21
lines changed

‎aws-cpp-sdk-s3-encryption-tests/DataHandlersTest.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,10 @@ namespace
134134
handler.PopulateRequest(request, contentCryptoMaterial);
135135
auto metadata = request.GetMetadata();
136136
ASSERT_NE(metadata.find(CONTENT_KEY_HEADER), metadata.end());
137-
ASSERT_EQ(HashingUtils::Base64Decode(metadata[CONTENT_KEY_HEADER]), contentCryptoMaterial.GetFinalCEK());
137+
ASSERT_EQ(HashingUtils::Base64Decode(metadata[CONTENT_KEY_HEADER]), static_cast<ByteBuffer>(contentCryptoMaterial.GetFinalCEK()));
138138

139139
ASSERT_NE(metadata.find(IV_HEADER), metadata.end());
140-
ASSERT_EQ(HashingUtils::Base64Decode(metadata[IV_HEADER]), contentCryptoMaterial.GetIV());
140+
ASSERT_EQ(HashingUtils::Base64Decode(metadata[IV_HEADER]), static_cast<ByteBuffer>(contentCryptoMaterial.GetIV()));
141141

142142
ASSERT_NE(metadata.find(CONTENT_CRYPTO_SCHEME_HEADER), metadata.end());
143143
ASSERT_STREQ(metadata[CONTENT_CRYPTO_SCHEME_HEADER].c_str(), ContentCryptoSchemeMapper::GetNameForContentCryptoScheme(contentCryptoMaterial.GetContentCryptoScheme()).c_str());
@@ -176,10 +176,10 @@ namespace
176176
auto metadata = result.GetMetadata();
177177

178178
ASSERT_NE(metadata.find(CONTENT_KEY_HEADER), metadata.end());
179-
ASSERT_EQ(HashingUtils::Base64Decode(metadata[CONTENT_KEY_HEADER]), readContentCryptoMaterial.GetFinalCEK());
179+
ASSERT_EQ(HashingUtils::Base64Decode(metadata[CONTENT_KEY_HEADER]), static_cast<ByteBuffer>(readContentCryptoMaterial.GetFinalCEK()));
180180

181181
ASSERT_NE(metadata.find(IV_HEADER), metadata.end());
182-
ASSERT_EQ(HashingUtils::Base64Decode(metadata[IV_HEADER]), readContentCryptoMaterial.GetIV());
182+
ASSERT_EQ(HashingUtils::Base64Decode(metadata[IV_HEADER]), static_cast<ByteBuffer>(readContentCryptoMaterial.GetIV()));
183183

184184
ASSERT_NE(metadata.find(CONTENT_CRYPTO_SCHEME_HEADER), metadata.end());
185185
ASSERT_STREQ(metadata[CONTENT_CRYPTO_SCHEME_HEADER].c_str(), ContentCryptoSchemeMapper::GetNameForContentCryptoScheme(readContentCryptoMaterial.GetContentCryptoScheme()).c_str());
@@ -206,10 +206,10 @@ namespace
206206
auto metadata = request.GetMetadata();
207207

208208
ASSERT_NE(metadata.find(CONTENT_KEY_HEADER), metadata.end());
209-
ASSERT_EQ(HashingUtils::Base64Decode(metadata[CONTENT_KEY_HEADER]), contentCryptoMaterial.GetFinalCEK());
209+
ASSERT_EQ(HashingUtils::Base64Decode(metadata[CONTENT_KEY_HEADER]), static_cast<ByteBuffer>(contentCryptoMaterial.GetFinalCEK()));
210210

211211
ASSERT_NE(metadata.find(IV_HEADER), metadata.end());
212-
ASSERT_EQ(HashingUtils::Base64Decode(metadata[IV_HEADER]), contentCryptoMaterial.GetIV());
212+
ASSERT_EQ(HashingUtils::Base64Decode(metadata[IV_HEADER]), static_cast<ByteBuffer>(contentCryptoMaterial.GetIV()));
213213

214214
ASSERT_NE(metadata.find(CONTENT_CRYPTO_SCHEME_HEADER), metadata.end());
215215
ASSERT_STREQ(metadata[CONTENT_CRYPTO_SCHEME_HEADER].c_str(), ContentCryptoSchemeMapper::GetNameForContentCryptoScheme(contentCryptoMaterial.GetContentCryptoScheme()).c_str());
@@ -283,10 +283,10 @@ namespace
283283
Aws::Map<Aws::String, Aws::String> cryptoContentMap = handler.DeserializeMap(jsonString);
284284

285285
ASSERT_NE(cryptoContentMap.find(CONTENT_KEY_HEADER), cryptoContentMap.end());
286-
ASSERT_EQ(HashingUtils::Base64Decode(cryptoContentMap[CONTENT_KEY_HEADER]), contentCryptoMaterial.GetFinalCEK());
286+
ASSERT_EQ(HashingUtils::Base64Decode(cryptoContentMap[CONTENT_KEY_HEADER]), static_cast<ByteBuffer>(contentCryptoMaterial.GetFinalCEK()));
287287

288288
ASSERT_NE(cryptoContentMap.find(IV_HEADER), cryptoContentMap.end());
289-
ASSERT_EQ(HashingUtils::Base64Decode(cryptoContentMap[IV_HEADER]), contentCryptoMaterial.GetIV());
289+
ASSERT_EQ(HashingUtils::Base64Decode(cryptoContentMap[IV_HEADER]), static_cast<ByteBuffer>(contentCryptoMaterial.GetIV()));
290290

291291
ASSERT_NE(cryptoContentMap.find(CONTENT_CRYPTO_SCHEME_HEADER), cryptoContentMap.end());
292292
ASSERT_STREQ(cryptoContentMap[CONTENT_CRYPTO_SCHEME_HEADER].c_str(), ContentCryptoSchemeMapper::GetNameForContentCryptoScheme(contentCryptoMaterial.GetContentCryptoScheme()).c_str());

‎cspell.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
// Crypto
3939
"decryptor", "encryptor", "NTSTATUS", "PBYTE", "PUCHAR", "noconf", "HAMC", "PBCRYPT", "BCRYPT", "libcrypto",
4040
"AWSLC", "CBCCTS", "tweaklen", "taglen", "blockcipher", "AESGCM", "compated", "outdata", "Decrypto", "GCMAAD",
41-
"CEKGCM", "HMACRAII",
41+
"CEKGCM", "HMACRAII", "OSSL", "ossl",
4242
// EC2
4343
"IMDS",
4444
// Eventstream

‎testing-resources/include/aws/external/gtest/gtest-printers.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char32_t);
384384

385385
GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::std::string);
386386
GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::std::string);
387-
#ifdef __cpp_char8_t
387+
#ifdef __cpp_lib_char8_t
388388
GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char8_t, ::std::u8string);
389389
GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char8_t, ::std::u8string);
390390
#endif
@@ -472,7 +472,7 @@ GTEST_API_ void PrintTo(char32_t c, ::std::ostream* os);
472472
inline void PrintTo(char16_t c, ::std::ostream* os) {
473473
PrintTo(ImplicitCast_<char32_t>(c), os);
474474
}
475-
#ifdef __cpp_char8_t
475+
#ifdef __cpp_lib_char8_t
476476
inline void PrintTo(char8_t c, ::std::ostream* os) {
477477
PrintTo(ImplicitCast_<char32_t>(c), os);
478478
}
@@ -504,7 +504,7 @@ inline void PrintTo(const unsigned char* s, ::std::ostream* os) {
504504
inline void PrintTo(unsigned char* s, ::std::ostream* os) {
505505
PrintTo(ImplicitCast_<const void*>(s), os);
506506
}
507-
#ifdef __cpp_char8_t
507+
#ifdef __cpp_lib_char8_t
508508
// Overloads for u8 strings.
509509
GTEST_API_ void PrintTo(const char8_t* s, ::std::ostream* os);
510510
inline void PrintTo(char8_t* s, ::std::ostream* os) {
@@ -556,7 +556,7 @@ inline void PrintTo(const ::std::string& s, ::std::ostream* os) {
556556
}
557557

558558
// Overloads for ::std::u8string
559-
#ifdef __cpp_char8_t
559+
#ifdef __cpp_lib_char8_t
560560
GTEST_API_ void PrintU8StringTo(const ::std::u8string& s, ::std::ostream* os);
561561
inline void PrintTo(const ::std::u8string& s, ::std::ostream* os) {
562562
PrintU8StringTo(s, os);
@@ -824,7 +824,7 @@ void UniversalPrintArray(const T* begin, size_t len, ::std::ostream* os) {
824824
GTEST_API_ void UniversalPrintArray(const char* begin, size_t len,
825825
::std::ostream* os);
826826

827-
#ifdef __cpp_char8_t
827+
#ifdef __cpp_lib_char8_t
828828
// This overload prints a (const) char8_t array compactly.
829829
GTEST_API_ void UniversalPrintArray(const char8_t* begin, size_t len,
830830
::std::ostream* os);
@@ -913,7 +913,7 @@ template <>
913913
class UniversalTersePrinter<char*> : public UniversalTersePrinter<const char*> {
914914
};
915915

916-
#ifdef __cpp_char8_t
916+
#ifdef __cpp_lib_char8_t
917917
template <>
918918
class UniversalTersePrinter<const char8_t*> {
919919
public:

‎testing-resources/include/aws/external/gtest/internal/gtest-port.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1917,7 +1917,7 @@ inline bool IsUpper(char ch) {
19171917
inline bool IsXDigit(char ch) {
19181918
return isxdigit(static_cast<unsigned char>(ch)) != 0;
19191919
}
1920-
#ifdef __cpp_char8_t
1920+
#ifdef __cpp_lib_char8_t
19211921
inline bool IsXDigit(char8_t ch) {
19221922
return isxdigit(static_cast<unsigned char>(ch)) != 0;
19231923
}

‎testing-resources/source/external/gtest/src/gtest-printers.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ static const char* GetCharWidthPrefix(signed char) { return ""; }
214214

215215
static const char* GetCharWidthPrefix(unsigned char) { return ""; }
216216

217-
#ifdef __cpp_char8_t
217+
#ifdef __cpp_lib_char8_t
218218
static const char* GetCharWidthPrefix(char8_t) { return "u8"; }
219219
#endif
220220

@@ -230,7 +230,7 @@ static CharFormat PrintAsStringLiteralTo(char c, ostream* os) {
230230
return PrintAsStringLiteralTo(ToChar32(c), os);
231231
}
232232

233-
#ifdef __cpp_char8_t
233+
#ifdef __cpp_lib_char8_t
234234
static CharFormat PrintAsStringLiteralTo(char8_t c, ostream* os) {
235235
return PrintAsStringLiteralTo(ToChar32(c), os);
236236
}
@@ -393,7 +393,7 @@ void UniversalPrintArray(const char* begin, size_t len, ostream* os) {
393393
UniversalPrintCharArray(begin, len, os);
394394
}
395395

396-
#ifdef __cpp_char8_t
396+
#ifdef __cpp_lib_char8_t
397397
// Prints a (const) char8_t array of 'len' elements, starting at address
398398
// 'begin'.
399399
void UniversalPrintArray(const char8_t* begin, size_t len, ostream* os) {
@@ -436,7 +436,7 @@ void PrintCStringTo(const Char* s, ostream* os) {
436436

437437
void PrintTo(const char* s, ostream* os) { PrintCStringTo(s, os); }
438438

439-
#ifdef __cpp_char8_t
439+
#ifdef __cpp_lib_char8_t
440440
void PrintTo(const char8_t* s, ostream* os) { PrintCStringTo(s, os); }
441441
#endif
442442

@@ -528,7 +528,7 @@ void PrintStringTo(const ::std::string& s, ostream* os) {
528528
}
529529
}
530530

531-
#ifdef __cpp_char8_t
531+
#ifdef __cpp_lib_char8_t
532532
void PrintU8StringTo(const ::std::u8string& s, ostream* os) {
533533
PrintCharsAsStringTo(s.data(), s.size(), os);
534534
}

‎toolchains/clang-c++20.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
set(CMAKE_C_COMPILER clang)
2+
set(CMAKE_CXX_COMPILER clang++)
3+
set(CMAKE_CXX_STANDARD 20)
4+
set(CPP_STANDARD 20)

‎toolchains/gcc10-c++20.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
set(CMAKE_C_COMPILER gcc10-gcc)
2+
set(CMAKE_CXX_COMPILER gcc10-c++)
3+
set(CMAKE_CXX_STANDARD 20)
4+
set(CPP_STANDARD 20)

0 commit comments

Comments
 (0)