From e01d95528ea2137a4a27a88d1f57c6cb260aafed Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Mon, 24 Sep 2018 11:57:52 -0700 Subject: Export of internal Abseil changes. -- eca34da4ccb7bb6a580f1364dff9ca053418fa3b by Abseil Team : Internal change. PiperOrigin-RevId: 214305433 -- 35393bdd21a87c4286f945fd34dda93afc4e0cd6 by Abseil Team : Move some implementation details of string_view around to facilitate compiling on NVCC. Abseil does not officially support NVCC as a reminder. PiperOrigin-RevId: 214184876 -- 61846cab9ab9476a4676ecade7173f68978cd038 by Jorg Brown : Move the initialization values for constants back to their declaration. PiperOrigin-RevId: 214135927 -- 7ac7df6c5f78f2faf419268c04618b936cb26065 by Abseil Team : Performance improvements on format parser. PiperOrigin-RevId: 214032366 -- 90b4c0cf20e9feaa257a7ece40adaf7db40a60a7 by Xiaoyi Zhang : Add static_assert check to absl::visit to make sure all overloads of the visitor return the same type, as required by the C++ standard. PiperOrigin-RevId: 213677001 -- 787995342101b4c181291cde9ecea3048536e4bd by Abseil Team : Update comment to indicate finite durations are less than InfiniteDuration. PiperOrigin-RevId: 213660328 -- d78f0dce7cc31218807e96d93b9e8513b6c80b24 by Jon Cohen : s/invariant/contract in the exceptions safety testing framework. This is a better term as these can be type invariants or function post conditions. They also are very similar ground as to what is covered by c++20 Contracts (and could even be replaced by them. PiperOrigin-RevId: 213631019 -- 0b3ff1a640de9a7391a6c233568802cf86245b0e by Abseil Team : Add noinline attribute for GetStackTrace/GetStackFrames/... so the skipped frames will not change because of inlining difference. PiperOrigin-RevId: 213009637 GitOrigin-RevId: eca34da4ccb7bb6a580f1364dff9ca053418fa3b Change-Id: Iff1022fd24e440fcbdf3c4ab2a915ca8954daa31 --- absl/types/optional_exception_safety_test.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'absl/types/optional_exception_safety_test.cc') diff --git a/absl/types/optional_exception_safety_test.cc b/absl/types/optional_exception_safety_test.cc index 31eb66d..d117ee5 100644 --- a/absl/types/optional_exception_safety_test.cc +++ b/absl/types/optional_exception_safety_test.cc @@ -43,7 +43,7 @@ bool ValueThrowsBadOptionalAccess(const OptionalT& optional) try { } template -AssertionResult CheckInvariants(OptionalT* optional_ptr) { +AssertionResult OptionalInvariants(OptionalT* optional_ptr) { // Check the current state post-throw for validity auto& optional = *optional_ptr; @@ -123,8 +123,8 @@ TEST(OptionalExceptionSafety, NothrowConstructors) { TEST(OptionalExceptionSafety, Emplace) { // Test the basic guarantee plus test the result of optional::has_value() // is false in all cases - auto disengaged_test = MakeExceptionSafetyTester().WithInvariants( - CheckInvariants, CheckDisengaged); + auto disengaged_test = MakeExceptionSafetyTester().WithContracts( + OptionalInvariants, CheckDisengaged); auto disengaged_test_empty = disengaged_test.WithInitialValue(Optional()); auto disengaged_test_nonempty = disengaged_test.WithInitialValue(Optional(kInitialInteger)); @@ -147,11 +147,11 @@ TEST(OptionalExceptionSafety, EverythingThrowsSwap) { // Test the basic guarantee plus test the result of optional::has_value() // remains the same auto test = - MakeExceptionSafetyTester().WithInvariants(CheckInvariants); + MakeExceptionSafetyTester().WithContracts(OptionalInvariants); auto disengaged_test_empty = test.WithInitialValue(Optional()) - .WithInvariants(CheckDisengaged); + .WithContracts(CheckDisengaged); auto engaged_test_nonempty = test.WithInitialValue(Optional(kInitialInteger)) - .WithInvariants(CheckEngaged); + .WithContracts(CheckEngaged); auto swap_empty = [](Optional* optional_ptr) { auto empty = Optional(); @@ -192,11 +192,11 @@ TEST(OptionalExceptionSafety, CopyAssign) { // Test the basic guarantee plus test the result of optional::has_value() // remains the same auto test = - MakeExceptionSafetyTester().WithInvariants(CheckInvariants); + MakeExceptionSafetyTester().WithContracts(OptionalInvariants); auto disengaged_test_empty = test.WithInitialValue(Optional()) - .WithInvariants(CheckDisengaged); + .WithContracts(CheckDisengaged); auto engaged_test_nonempty = test.WithInitialValue(Optional(kInitialInteger)) - .WithInvariants(CheckEngaged); + .WithContracts(CheckEngaged); auto copyassign_nonempty = [](Optional* optional_ptr) { auto nonempty = @@ -218,11 +218,11 @@ TEST(OptionalExceptionSafety, MoveAssign) { // Test the basic guarantee plus test the result of optional::has_value() // remains the same auto test = - MakeExceptionSafetyTester().WithInvariants(CheckInvariants); + MakeExceptionSafetyTester().WithContracts(OptionalInvariants); auto disengaged_test_empty = test.WithInitialValue(Optional()) - .WithInvariants(CheckDisengaged); + .WithContracts(CheckDisengaged); auto engaged_test_nonempty = test.WithInitialValue(Optional(kInitialInteger)) - .WithInvariants(CheckEngaged); + .WithContracts(CheckEngaged); auto moveassign_empty = [](Optional* optional_ptr) { auto empty = Optional(); -- cgit v1.2.3