[util]TLazyValue: remove operator bool and Defined

2 files changed, 11 insertions, 15 deletions

diff --git a/util/generic/lazy_value.h b/util/generic/lazy_value.h
index 3c720f76b5..e54cdb31d0 100644
--- a/util/generic/lazy_value.h
+++ b/util/generic/lazy_value.h
@@ -15,16 +15,12 @@ public:
     {
     }
 
-    explicit operator bool() const noexcept {
-        return Defined();
-    }
-
-    bool Defined() const noexcept {
+    bool WasLazilyInitialized() const noexcept {
         return ValueHolder.Defined();
     }
 
     const T& GetRef() const {
-        if (!Defined()) {
+        if (!WasLazilyInitialized()) {
             InitDefault();
         }
         return *ValueHolder;
diff --git a/util/generic/lazy_value_ut.cpp b/util/generic/lazy_value_ut.cpp
index f6135880c3..ff5a0156c5 100644
--- a/util/generic/lazy_value_ut.cpp
+++ b/util/generic/lazy_value_ut.cpp
@@ -7,9 +7,9 @@ Y_UNIT_TEST_SUITE(TLazyValueTestSuite) {
         TLazyValue<int> value([]() {
             return 5;
         });
-        UNIT_ASSERT(!value);
+        UNIT_ASSERT(!value.WasLazilyInitialized());
         UNIT_ASSERT_EQUAL(*value, 5);
-        UNIT_ASSERT(value);
+        UNIT_ASSERT(value.WasLazilyInitialized());
     }
 
     Y_UNIT_TEST(TestLazyValueInitialization) {
@@ -26,19 +26,19 @@ Y_UNIT_TEST_SUITE(TLazyValueTestSuite) {
 
     Y_UNIT_TEST(TestLazyValueCopy) {
         TLazyValue<int> value([]() { return 5; });
-        UNIT_ASSERT(!value);
+        UNIT_ASSERT(!value.WasLazilyInitialized());
 
         TLazyValue<int> emptyCopy = value;
-        UNIT_ASSERT(!emptyCopy);
+        UNIT_ASSERT(!emptyCopy.WasLazilyInitialized());
 
         UNIT_ASSERT_EQUAL(*emptyCopy, 5);
-        UNIT_ASSERT(emptyCopy);
-        UNIT_ASSERT(!value);
+        UNIT_ASSERT(emptyCopy.WasLazilyInitialized());
+        UNIT_ASSERT(!value.WasLazilyInitialized());
 
         UNIT_ASSERT_EQUAL(*value, 5);
 
         TLazyValue<int> notEmptyCopy = value;
-        UNIT_ASSERT(notEmptyCopy);
+        UNIT_ASSERT(notEmptyCopy.WasLazilyInitialized());
         UNIT_ASSERT_EQUAL(*notEmptyCopy, 5);
     }
 
@@ -150,8 +150,8 @@ Y_UNIT_TEST_SUITE(TLazyValueTestSuite) {
         auto lv = MakeLazy([] {
             return 100500;
         });
-        UNIT_ASSERT(!lv);
+        UNIT_ASSERT(!lv.WasLazilyInitialized());
         UNIT_ASSERT(lv.GetRef() == 100500);
-        UNIT_ASSERT(lv);
+        UNIT_ASSERT(lv.WasLazilyInitialized());
     }
 }