From 03c1142df9b0ddd450430b7aae70940c0d071ff6 Mon Sep 17 00:00:00 2001 From: Yedidya Feldblum Date: Tue, 6 Jun 2017 15:02:17 -0700 Subject: [PATCH] Rename exception_wrapper::get_object to get_exception Summary: [Folly] Rename `exception_wrapper::get_object` to `get_exception`. This will be a template overload of the existing non-template member `get_exception`, but it should just work. Reviewed By: spacedentist Differential Revision: D5180845 fbshipit-source-id: 28e16e039ec6a7939b38f217b4ad5c6bc803f515 --- folly/ExceptionWrapper-inl.h | 4 +-- folly/ExceptionWrapper.h | 4 +-- folly/test/ExceptionWrapperTest.cpp | 44 ++++++++++++++--------------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/folly/ExceptionWrapper-inl.h b/folly/ExceptionWrapper-inl.h index aca35f2c..287275ae 100644 --- a/folly/ExceptionWrapper-inl.h +++ b/folly/ExceptionWrapper-inl.h @@ -351,14 +351,14 @@ inline std::exception const* exception_wrapper::get_exception() const noexcept { } template -inline Ex* exception_wrapper::get_object() noexcept { +inline Ex* exception_wrapper::get_exception() noexcept { Ex* object{nullptr}; with_exception([&](Ex& ex) { object = &ex; }); return object; } template -inline Ex const* exception_wrapper::get_object() const noexcept { +inline Ex const* exception_wrapper::get_exception() const noexcept { Ex const* object{nullptr}; with_exception([&](Ex const& ex) { object = &ex; }); return object; diff --git a/folly/ExceptionWrapper.h b/folly/ExceptionWrapper.h index 82dfde72..6e11dd3c 100644 --- a/folly/ExceptionWrapper.h +++ b/folly/ExceptionWrapper.h @@ -464,10 +464,10 @@ class exception_wrapper final { //! \note This function may cause an exception to be thrown and immediately //! caught internally, affecting runtime performance. template - Ex* get_object() noexcept; + Ex* get_exception() noexcept; //! \overload template - Ex const* get_object() const noexcept; + Ex const* get_exception() const noexcept; //! \return A `std::exception_ptr` that references either the exception held //! by `*this`, or a copy of same. diff --git a/folly/test/ExceptionWrapperTest.cpp b/folly/test/ExceptionWrapperTest.cpp index fde0e8a9..07930ee0 100644 --- a/folly/test/ExceptionWrapperTest.cpp +++ b/folly/test/ExceptionWrapperTest.cpp @@ -215,8 +215,8 @@ TEST(ExceptionWrapper, with_exception_ptr_empty) { EXPECT_EQ(exception_wrapper::none(), ew.type()); EXPECT_FALSE(bool(ew)); EXPECT_EQ(nullptr, ew.get_exception()); - EXPECT_EQ(nullptr, ew.get_object()); - EXPECT_EQ(nullptr, ew.get_object()); + EXPECT_EQ(nullptr, ew.get_exception()); + EXPECT_EQ(nullptr, ew.get_exception()); EXPECT_FALSE(ew.has_exception_ptr()); EXPECT_EQ(nullptr, ew.to_exception_ptr()); EXPECT_FALSE(ew.has_exception_ptr()); @@ -232,8 +232,8 @@ TEST(ExceptionWrapper, with_shared_ptr_test) { EXPECT_TRUE(bool(ew)); EXPECT_EQ(typeid(std::runtime_error), ew.type()); EXPECT_NE(nullptr, ew.get_exception()); - EXPECT_NE(nullptr, ew.get_object()); - EXPECT_EQ(nullptr, ew.get_object()); + EXPECT_NE(nullptr, ew.get_exception()); + EXPECT_EQ(nullptr, ew.get_exception()); EXPECT_FALSE(ew.has_exception_ptr()); EXPECT_NE(nullptr, ew.to_exception_ptr()); EXPECT_TRUE(ew.has_exception_ptr()); @@ -248,8 +248,8 @@ TEST(ExceptionWrapper, with_shared_ptr_test) { EXPECT_FALSE(bool(ew)); EXPECT_EQ(exception_wrapper::none(), ew.type()); EXPECT_EQ(nullptr, ew.get_exception()); - EXPECT_EQ(nullptr, ew.get_object()); - EXPECT_EQ(nullptr, ew.get_object()); + EXPECT_EQ(nullptr, ew.get_exception()); + EXPECT_EQ(nullptr, ew.get_exception()); EXPECT_EQ(nullptr, ew.to_exception_ptr()); EXPECT_EQ("", ew.class_name()); EXPECT_EQ("", ew.what()); @@ -264,8 +264,8 @@ TEST(ExceptionWrapper, with_exception_ptr_exn_test) { EXPECT_TRUE(bool(ew)); EXPECT_EQ(typeid(std::runtime_error), ew.type()); EXPECT_NE(nullptr, ew.get_exception()); - EXPECT_NE(nullptr, ew.get_object()); - EXPECT_EQ(nullptr, ew.get_object()); + EXPECT_NE(nullptr, ew.get_exception()); + EXPECT_EQ(nullptr, ew.get_exception()); EXPECT_TRUE(ew.has_exception_ptr()); EXPECT_EQ(ep, ew.to_exception_ptr()); EXPECT_TRUE(ew.has_exception_ptr()); @@ -280,8 +280,8 @@ TEST(ExceptionWrapper, with_exception_ptr_exn_test) { EXPECT_FALSE(bool(ew)); EXPECT_EQ(exception_wrapper::none(), ew.type()); EXPECT_EQ(nullptr, ew.get_exception()); - EXPECT_EQ(nullptr, ew.get_object()); - EXPECT_EQ(nullptr, ew.get_object()); + EXPECT_EQ(nullptr, ew.get_exception()); + EXPECT_EQ(nullptr, ew.get_exception()); EXPECT_EQ(nullptr, ew.to_exception_ptr()); EXPECT_EQ("", ew.class_name()); EXPECT_EQ("", ew.what()); @@ -295,8 +295,8 @@ TEST(ExceptionWrapper, with_exception_ptr_any_test) { auto ew = exception_wrapper(ep, from_eptr(ep)); EXPECT_TRUE(bool(ew)); EXPECT_EQ(nullptr, ew.get_exception()); - EXPECT_EQ(nullptr, ew.get_object()); - EXPECT_NE(nullptr, ew.get_object()); + EXPECT_EQ(nullptr, ew.get_exception()); + EXPECT_NE(nullptr, ew.get_exception()); EXPECT_TRUE(ew.has_exception_ptr()); EXPECT_EQ(ep, ew.to_exception_ptr()); EXPECT_TRUE(ew.has_exception_ptr()); @@ -310,8 +310,8 @@ TEST(ExceptionWrapper, with_exception_ptr_any_test) { exception_wrapper(std::move(ew)); EXPECT_FALSE(bool(ew)); EXPECT_EQ(nullptr, ew.get_exception()); - EXPECT_EQ(nullptr, ew.get_object()); - EXPECT_EQ(nullptr, ew.get_object()); + EXPECT_EQ(nullptr, ew.get_exception()); + EXPECT_EQ(nullptr, ew.get_exception()); EXPECT_EQ(nullptr, ew.to_exception_ptr()); EXPECT_FALSE(ew.has_exception_ptr()); EXPECT_EQ("", ew.class_name()); @@ -325,8 +325,8 @@ TEST(ExceptionWrapper, with_non_std_exception_test) { auto ew = exception_wrapper(folly::in_place, 42); EXPECT_TRUE(bool(ew)); EXPECT_EQ(nullptr, ew.get_exception()); - EXPECT_EQ(nullptr, ew.get_object()); - EXPECT_NE(nullptr, ew.get_object()); + EXPECT_EQ(nullptr, ew.get_exception()); + EXPECT_NE(nullptr, ew.get_exception()); EXPECT_FALSE(ew.has_exception_ptr()); EXPECT_EQ("int", ew.class_name()); EXPECT_EQ("int", ew.what()); @@ -342,8 +342,8 @@ TEST(ExceptionWrapper, with_non_std_exception_test) { exception_wrapper(std::move(ew)); EXPECT_FALSE(bool(ew)); EXPECT_EQ(nullptr, ew.get_exception()); - EXPECT_EQ(nullptr, ew.get_object()); - EXPECT_EQ(nullptr, ew.get_object()); + EXPECT_EQ(nullptr, ew.get_exception()); + EXPECT_EQ(nullptr, ew.get_exception()); EXPECT_EQ(nullptr, ew.to_exception_ptr()); EXPECT_FALSE(ew.has_exception_ptr()); EXPECT_EQ("", ew.class_name()); @@ -358,8 +358,8 @@ TEST(ExceptionWrapper, with_exception_ptr_any_nil_test) { auto ew = exception_wrapper(ep); // concrete type is erased EXPECT_TRUE(bool(ew)); EXPECT_EQ(nullptr, ew.get_exception()); - EXPECT_EQ(nullptr, ew.get_object()); - EXPECT_NE(nullptr, ew.get_object()); + EXPECT_EQ(nullptr, ew.get_exception()); + EXPECT_NE(nullptr, ew.get_exception()); EXPECT_EQ(ep, ew.to_exception_ptr()); EXPECT_EQ("", ew.class_name()); // because concrete type is // erased @@ -372,8 +372,8 @@ TEST(ExceptionWrapper, with_exception_ptr_any_nil_test) { exception_wrapper(std::move(ew)); EXPECT_FALSE(bool(ew)); EXPECT_EQ(nullptr, ew.get_exception()); - EXPECT_EQ(nullptr, ew.get_object()); - EXPECT_EQ(nullptr, ew.get_object()); + EXPECT_EQ(nullptr, ew.get_exception()); + EXPECT_EQ(nullptr, ew.get_exception()); EXPECT_EQ(nullptr, ew.to_exception_ptr()); EXPECT_EQ("", ew.class_name()); EXPECT_EQ("", ew.what()); -- 2.34.1